Update bootstrap scripts.

1 files changed, 5 insertions, 5 deletions

diff --git a/genbootstrap.sh b/genbootstrap.sh
index 93e8e74..44babf2 100755
--- a/genbootstrap.sh
+++ b/genbootstrap.sh
@@ -1,13 +1,14 @@
 #!/bin/sh
+set -x
 
 if test `uname` = Plan9; then
     export MYR_MUSE=../muse/6.out
     export MYR_MC=../6/6.out
     export MYR_RT=../rt/_myrrt.6
 else
-    export MYR_MUSE=../muse/muse
-    export MYR_MC=../6/6m
-    export MYR_RT=../rt/_myrrt.o
+    export MYR_MUSE=`pwd`/muse/muse
+    export MYR_MC=`pwd`/6/6m
+    export MYR_RT=`pwd`/rt/_myrrt.o
 fi
 ./mbldwrap.sh
 cp mbld/mbld xmbld
@@ -20,12 +21,11 @@ echo '#!/bin/sh' > $bootscript
 echo '# This script is generated by genbootstrap.sh' >> $bootscript
 echo '# to regenerate, run "make bootstrap"' >> $bootscript
 echo 'pwd=`pwd`' >> $bootscript
-echo 'export PATH=`pwd`:`pwd`/6:`pwd`/muse:$PATH' >> $bootscript
 ./xmbld -Rnone | \
     sed "s:Entering directory '\\(.*\\)':	cd \$pwd/\\1:g" | \
     sed "s:Leaving directory.*:	cd \$pwd:g" | \
     sed "s:\\([a-zA-Z0-9_-]*\\)+.*:\`\$pwd/sysselect.sh \1\`:" | \
-    sed "s:`pwd`:\`pwd\`:g" | \
+    sed "s:`pwd`:\$pwd:g" | \
     grep '^	' | \
     sed 's/.*/echo &;&/' | \
     tee -a $bootscript