Mercurial > octave-nkf
changeset 6155:ab5008998876
[project @ 2006-11-13 18:49:52 by jwe]
| author | jwe |
|---|---|
| date | Mon, 13 Nov 2006 18:49:52 +0000 |
| parents | 08f0dabf17b9 |
| children | a46f14cdbecd |
| files | ChangeLog Makeconf.in run-octave.in |
| diffstat | 3 files changed, 15 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Mon Nov 13 18:30:25 2006 +0000 +++ b/ChangeLog Mon Nov 13 18:49:52 2006 +0000 @@ -1,3 +1,10 @@ +2006-11-13 John W. Eaton <jwe@octave.org> + + * run-octave.in: Substitute liboctinterp, liboctave, and libcruft. + Use them to set LD_PRELOAD. + * Makeconf.in (do-subst-script-vals): Also substitute + liboctinterp, liboctave, and libcruft. + 2006-11-13 Rafael Laboissiere <rafael@debian.org> * mkoctfile.in: Add -Wl,... options to ldflags, not pass_on_flags.
--- a/Makeconf.in Mon Nov 13 18:30:25 2006 +0000 +++ b/Makeconf.in Mon Nov 13 18:49:52 2006 +0000 @@ -597,6 +597,9 @@ echo "making $@ from $<" $(SED) < $< \ -e "s|%library_path_var%|${library_path_var}|g" \ + -e "s|%liboctinterp%|${LIBPRE}octinterp.${SHLEXT}|g" \ + -e "s|%liboctave%|${LIBPRE}octave.${SHLEXT}|g" \ + -e "s|%libcruft%|${LIBPRE}cruft.${SHLEXT}|g" \ -e "s|%srcdir%|${srcdir}|" \ -e "s|%top_srcdir%|${top_srcdir}|" \ -e "s|%abs_top_srcdir%|${abs_top_srcdir}|" \
--- a/run-octave.in Mon Nov 13 18:30:25 2006 +0000 +++ b/run-octave.in Mon Nov 13 18:49:52 2006 +0000 @@ -8,6 +8,10 @@ top_srcdir='%abs_top_srcdir%' builddir='%builddir%' +liboctinterp="$builddir/src/%liboctinterp%" +liboctave="$builddir/liboctave/%liboctave%" +libcruft="$builddir/libcruft/%libcruft%" + d1="$top_srcdir/test" d2="$top_srcdir/scripts" d3="$builddir/scripts" @@ -49,6 +53,7 @@ if [ -n "$args" ]; then OCTAVE_SITE_INITFILE="$top_srcdir/scripts/startup/main-rcfile" \ + LD_PRELOAD="$liboctinterp $liboctave $libcruft" \ %library_path_var%="$builddir/src:$builddir/liboctave:$builddir/libcruft:$%library_path_var%" \ exec $driver "$builddir/src/octave" "$args" "$@" else