summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xgenbootstrap.sh10
-rwxr-xr-xmk/bootstrap/bootstrap+Plan9-amd64.sh4
2 files changed, 7 insertions, 7 deletions
diff --git a/genbootstrap.sh b/genbootstrap.sh
index 14092d8..adb7768 100755
--- a/genbootstrap.sh
+++ b/genbootstrap.sh
@@ -1,14 +1,13 @@
#!/bin/sh
-export PATH="`pwd`:`pwd`6:`pwd`/muse:$PATH"
if test `uname` = Plan9; then
export MYR_MUSE=../muse/6.out
export MYR_MC=../6/6.out
- export MYR_RT=`pwd`/rt/_myrrt.6
+ export MYR_RT=../rt/_myrrt.6
else
- export MYR_MUSE=muse
- export MYR_MC=6m
- export MYR_RT=`pwd`/rt/_myrrt.o
+ export MYR_MUSE=../muse
+ export MYR_MC=../6m
+ export MYR_RT=../rt/_myrrt.o
fi
./mbldwrap.sh
cp mbld/mbld xmbld
@@ -24,6 +23,7 @@ echo 'export PATH=`pwd`:`pwd`/6:`pwd`/muse:$PATH' >> $bootscript
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" | \
grep '^ ' | \
sed 's/.*/echo &;&/' | \
tee -a $bootscript
diff --git a/mk/bootstrap/bootstrap+Plan9-amd64.sh b/mk/bootstrap/bootstrap+Plan9-amd64.sh
index b8e9143..dedff70 100755
--- a/mk/bootstrap/bootstrap+Plan9-amd64.sh
+++ b/mk/bootstrap/bootstrap+Plan9-amd64.sh
@@ -103,8 +103,8 @@ echo ../6/6.out -I ../libregex -I ../libbio -I ../libstd install.myr ; ../6/6.o
echo ../6/6.out -I ../libregex -I ../libbio -I ../libstd clean.myr ; ../6/6.out -I ../libregex -I ../libbio -I ../libstd clean.myr
echo ../6/6.out -I ../libregex -I ../libbio -I ../libstd test.myr ; ../6/6.out -I ../libregex -I ../libbio -I ../libstd test.myr
echo ../6/6.out -I ../libregex -I ../libbio -I ../libstd main.myr ; ../6/6.out -I ../libregex -I ../libbio -I ../libstd main.myr
-echo 6l -lo mbld /usr/glenda/mc2/mc/rt/_myrrt.6 clean.6 types.6 deps.6 fsel.6 util.6 parse.6 main.6 build.6 opts.6 config.6 install.6 test.6 ../libregex/libregex.a ../libbio/libbio.a ../libstd/libstd.a ../libstd/libsys.a ; 6l -lo mbld /usr/glenda/mc2/mc/rt/_myrrt.6 clean.6 types.6 deps.6 fsel.6 util.6 parse.6 main.6 build.6 opts.6 config.6 install.6 test.6 ../libregex/libregex.a ../libbio/libbio.a ../libstd/libstd.a ../libstd/libsys.a
+echo 6l -lo mbld ../rt/_myrrt.6 clean.6 types.6 deps.6 fsel.6 util.6 parse.6 main.6 build.6 opts.6 config.6 install.6 test.6 ../libregex/libregex.a ../libbio/libbio.a ../libstd/libstd.a ../libstd/libsys.a ; 6l -lo mbld ../rt/_myrrt.6 clean.6 types.6 deps.6 fsel.6 util.6 parse.6 main.6 build.6 opts.6 config.6 install.6 test.6 ../libregex/libregex.a ../libbio/libbio.a ../libstd/libstd.a ../libstd/libsys.a
echo cd $pwd; cd $pwd
echo cd $pwd/libregex; cd $pwd/libregex
echo ../6/6.out -I . -I ../libbio -I ../libstd redump.myr ; ../6/6.out -I . -I ../libbio -I ../libstd redump.myr
-echo 6l -lo redump /usr/glenda/mc2/mc/rt/_myrrt.6 redump.6 libregex.a ../libbio/libbio.a ../libstd/libstd.a ../libstd/libsys.a ; 6l -lo redump /usr/glenda/mc2/mc/rt/_myrrt.6 redump.6 libregex.a ../libbio/libbio.a ../libstd/libstd.a ../libstd/libsys.a
+echo 6l -lo redump ../rt/_myrrt.6 redump.6 libregex.a ../libbio/libbio.a ../libstd/libstd.a ../libstd/libsys.a ; 6l -lo redump ../rt/_myrrt.6 redump.6 libregex.a ../libbio/libbio.a ../libstd/libstd.a ../libstd/libsys.a