comparison Makeconf.in @ 9613:16907d1153d1

attempt to fix LD_PRELOAD for Cygwin
author John W. Eaton <jwe@octave.org>
date Fri, 04 Sep 2009 11:25:44 -0400
parents 55ecaefb7d0f
children ee3a5e9a381c
comparison
equal deleted inserted replaced
9612:66970dd627f6 9613:16907d1153d1
468 startupfiledir = ${fcnfiledir}/startup 468 startupfiledir = ${fcnfiledir}/startup
469 localstartupfiledir = ${localfcnfiledir}/startup 469 localstartupfiledir = ${localfcnfiledir}/startup
470 470
471 # LD_LIBRARY_PATH, DYLD_LIBRARY_PATH, PATH, ... 471 # LD_LIBRARY_PATH, DYLD_LIBRARY_PATH, PATH, ...
472 library_path_var = @library_path_var@ 472 library_path_var = @library_path_var@
473
474 # The separator used for elements of the LD_PRELOAD variable (might be
475 # a space, so protect with $(null))
476 null :=
477 ldpreloadsep = $(null)@ldpreloadsep@$(null)
473 478
474 NO_OCT_FILE_STRIP = @NO_OCT_FILE_STRIP@ 479 NO_OCT_FILE_STRIP = @NO_OCT_FILE_STRIP@
475 480
476 # The following pattern rules and the substitution functions require 481 # The following pattern rules and the substitution functions require
477 # GNU make. If you don't have it, get it! 482 # GNU make. If you don't have it, get it!
763 -e "s|%SED%|${SED}|g" \ 768 -e "s|%SED%|${SED}|g" \
764 -e "s|%library_path_var%|${library_path_var}|g" \ 769 -e "s|%library_path_var%|${library_path_var}|g" \
765 -e "s|%liboctinterp%|${SHLPRE}octinterp.${SHLEXT}|g" \ 770 -e "s|%liboctinterp%|${SHLPRE}octinterp.${SHLEXT}|g" \
766 -e "s|%liboctave%|${SHLPRE}octave.${SHLEXT}|g" \ 771 -e "s|%liboctave%|${SHLPRE}octave.${SHLEXT}|g" \
767 -e "s|%libcruft%|${SHLPRE}cruft.${SHLEXT}|g" \ 772 -e "s|%libcruft%|${SHLPRE}cruft.${SHLEXT}|g" \
773 -e "s|%ldpreloadsep%|${ldpreloadsep}|g" \
768 -e "s|%srcdir%|${srcdir}|" \ 774 -e "s|%srcdir%|${srcdir}|" \
769 -e "s|%top_srcdir%|${top_srcdir}|" \ 775 -e "s|%top_srcdir%|${top_srcdir}|" \
770 -e "s|%abs_top_srcdir%|${abs_top_srcdir}|" \ 776 -e "s|%abs_top_srcdir%|${abs_top_srcdir}|" \
771 -e "s|%builddir%|$(shell pwd)|" > $@-t 777 -e "s|%builddir%|$(shell pwd)|" > $@-t
772 $(simple-move-if-change-rule) 778 $(simple-move-if-change-rule)