# HG changeset patch
# User jwe
# Date 1161697951 0
# Node ID 934146a33e83d00ab37b3f42ef42c42f5e5aafef
# Parent  4036e6fca790486cdb6a8a41084c655499328d47
[project @ 2006-10-24 13:52:30 by jwe]

diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-10-24  John W. Eaton  <jwe@octave.org>
+
+	* run-octave.in: Only modify .gdbinit if -g option is given.
+	Use $(/bin/pwd) instead of $(pwd).
+
 2006-10-23  John W. Eaton  <jwe@octave.org>
 
 	* emacs/Makefile.in (SOURCES, DISTFILES, install, install-strip,
diff --git a/run-octave.in b/run-octave.in
--- a/run-octave.in
+++ b/run-octave.in
@@ -9,14 +9,15 @@
 done
 LOADPATH=$(echo $LOADPATH | sed 's|^:||')
 IMAGEPATH="$top_srcdir/scripts/image"
+echo $LOADPATH
 args="--path=$LOADPATH --image-path=$IMAGEPATH"
-if [ $(pwd) = "$builddir" ]; then
-  sed "s|^set args.*$|set args $args|" .gdbinit > .gdbinit-tmp
-  mv .gdbinit-tmp .gdbinit
-fi
 if [ $# -gt 0 ]; then
   if [ "x$1" = "x-g" ]; then
     driver="gdb"
+    if [ $(/bin/pwd) = "$builddir" ]; then
+      sed "s|^set args.*$|set args $args|" .gdbinit > .gdbinit-tmp
+      mv .gdbinit-tmp .gdbinit
+    fi
     args=""
     shift
   elif [ "x$1" = "x-valgrind" ]; then