Mercurial > hg > octave-nkf
comparison run-octave.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 | f9ab19428cd8 |
children | 0d4613a736e9 |
comparison
equal
deleted
inserted
replaced
9612:66970dd627f6 | 9613:16907d1153d1 |
---|---|
28 # in these names? | 28 # in these names? |
29 | 29 |
30 top_srcdir='%abs_top_srcdir%' | 30 top_srcdir='%abs_top_srcdir%' |
31 builddir='%builddir%' | 31 builddir='%builddir%' |
32 | 32 |
33 ldpreloadsep="%ldpreloadsep%" | |
33 liboctinterp="$builddir/src/%liboctinterp%" | 34 liboctinterp="$builddir/src/%liboctinterp%" |
34 liboctave="$builddir/liboctave/%liboctave%" | 35 liboctave="$builddir/liboctave/%liboctave%" |
35 libcruft="$builddir/libcruft/%libcruft%" | 36 libcruft="$builddir/libcruft/%libcruft%" |
36 | 37 |
37 d1="$top_srcdir/test" | 38 d1="$top_srcdir/test" |
66 shift | 67 shift |
67 fi | 68 fi |
68 fi | 69 fi |
69 | 70 |
70 OCTAVE_SITE_INITFILE="$top_srcdir/scripts/startup/main-rcfile" \ | 71 OCTAVE_SITE_INITFILE="$top_srcdir/scripts/startup/main-rcfile" \ |
71 LD_PRELOAD="$liboctinterp $liboctave $libcruft" \ | 72 LD_PRELOAD="$libcruft$ldpreloadsep$liboctave$ldpreloadsep$liboctinterp" \ |
72 %library_path_var%="$builddir/src:$builddir/liboctave:$builddir/libcruft:$%library_path_var%" \ | 73 %library_path_var%="$builddir/src:$builddir/liboctave:$builddir/libcruft:$%library_path_var%" \ |
73 exec $driver "$builddir/src/octave" --no-init-path --path="$LOADPATH" --image-path="$IMAGEPATH" --doc-cache-file="$DOCFILE" --info-file="$INFOFILE" "$@" | 74 exec $driver "$builddir/src/octave" --no-init-path --path="$LOADPATH" --image-path="$IMAGEPATH" --doc-cache-file="$DOCFILE" --info-file="$INFOFILE" "$@" |
74 | 75 |