Mercurial > octave
diff run-octave.in @ 20479:ac0f7acdc3fd
avoid executing startup file twice when using run-octave script (bug #45872)
* site-rcfile: Rename from local-rcfile.
* version-rcfile: Rename from main-rcfile.
* scripts/startup/module.mk: Update to match new names.
(install-startup-files, uninstall-startup-files): Move rules here from
scripts/module.mk.
* site-rcfile, version-rcfile: Note environment variables that may be
used to select site and version rcfiles to execute.
* run-octave.in (OCTAVE_VERSION_INITFILE): Define to use
version-rcfile from source tree.
(OCTAVE_SITE_INITFILE): Update to use site-rcfile from source tree.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Fri, 04 Sep 2015 12:45:46 -0400 |
| parents | a63f9cb609a1 |
| children | 4a25c398ffa2 |
line wrap: on
line diff
--- a/run-octave.in Thu Sep 03 19:00:53 2015 -0400 +++ b/run-octave.in Fri Sep 04 12:45:46 2015 -0400 @@ -94,7 +94,8 @@ OCTAVE_DEFAULT_QT_SETTINGS="$builddir/libgui/default-qt-settings"; export OCTAVE_DEFAULT_QT_SETTINGS OCTAVE_JAVA_DIR="$builddir/scripts/java"; export OCTAVE_JAVA_DIR OCTAVE_LOCALE_DIR="$builddir/libgui/languages"; export OCTAVE_LOCALE_DIR -OCTAVE_SITE_INITFILE="$top_srcdir/scripts/startup/main-rcfile"; export OCTAVE_SITE_INITFILE +OCTAVE_SITE_INITFILE="$top_srcdir/scripts/startup/site-rcfile"; export OCTAVE_SITE_INITFILE +OCTAVE_VERSION_INITFILE="$top_srcdir/scripts/startup/version-rcfile"; export OCTAVE_VERSION_INITFILE exec $builddir/libtool --mode=execute $driver \ "$octave_executable" --no-init-path --path="$LOADPATH" \