Mercurial > octave-nkf
changeset 6028:3dbbbec85190
[project @ 2006-10-04 13:42:21 by jwe]
| author | jwe |
|---|---|
| date | Wed, 04 Oct 2006 13:42:21 +0000 |
| parents | 068e52f1c005 |
| children | e282b629db6f |
| files | ChangeLog Makeconf.in run-octave.in |
| diffstat | 3 files changed, 11 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Tue Oct 03 20:07:56 2006 +0000 +++ b/ChangeLog Wed Oct 04 13:42:21 2006 +0000 @@ -1,3 +1,9 @@ +2006-10-04 John W. Eaton <jwe@octave.org> + + * Makeconf.in (library_path_var): Substitute value from configure. + (do-subst-script-vals): Add library_path_var to the list. + * run-octave.in: Substitute value here. + 2006-10-03 John W. Eaton <jwe@octave.org> * configure.in: Warn if PCRE library is not found.
--- a/Makeconf.in Tue Oct 03 20:07:56 2006 +0000 +++ b/Makeconf.in Wed Oct 04 13:42:21 2006 +0000 @@ -330,6 +330,9 @@ startupfiledir = ${fcnfiledir}/startup localstartupfiledir = ${localfcnfiledir}/startup +# LD_LIBRARY_PATH, DYLD_LIBRARY_PATH, PATH, ... +library_path_var = @library_path_var@ + # The -I flags to use for the mkoctfile script. ifeq ($(includedir),/usr/include) MKOCTFILE_INCFLAGS = \ @@ -554,6 +557,7 @@ define do-subst-script-vals echo "making $@ from $<" $(SED) < $< \ + -e "s|%library_path_var%|${library_path_var}|g" \ -e "s|%srcdir%|${srcdir}|" \ -e "s|%top_srcdir%|${top_srcdir}|" \ -e "s|%abs_top_srcdir%|${abs_top_srcdir}|" \
--- a/run-octave.in Tue Oct 03 20:07:56 2006 +0000 +++ b/run-octave.in Wed Oct 04 13:42:21 2006 +0000 @@ -28,6 +28,6 @@ fi fi OCTAVE_SITE_INITFILE=$top_srcdir/scripts/startup/main-rcfile \ -LD_LIBRARY_PATH="$builddir/src:$builddir/liboctave:$builddir/libcruft:$LD_LIBRARY_PATH" \ +%library_path_var%="$builddir/src:$builddir/liboctave:$builddir/libcruft:$%library_path_var%" \ exec $driver $builddir/src/octave $args "$@"