# HG changeset patch
# User jwe
# Date 1159969341 0
# Node ID 3dbbbec85190e8c8975467afd71712ae379b61ec
# Parent  068e52f1c005983f0492ab77a54590e01c0bd46a
[project @ 2006-10-04 13:42:21 by jwe]

diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -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.
diff --git a/Makeconf.in b/Makeconf.in
--- a/Makeconf.in
+++ b/Makeconf.in
@@ -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}|" \
diff --git a/run-octave.in b/run-octave.in
--- a/run-octave.in
+++ b/run-octave.in
@@ -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 "$@"