[project @ 1996-01-11 14:06:51 by partain]

[ghc-hetmet.git] / STARTUP.in

diff --git a/STARTUP.in b/STARTUP.in
index d8b9171..814426a 100644 (file)
--- a/STARTUP.in
+++ b/STARTUP.in
@@ -65,26 +65,35 @@ done
 
 # OK, now make the \`real' Makefiles
 
-for i in @DoingGHC@ @DoingHappy@ @DoingHaggis@ @DoingNoFib@ ; do
+passed_in_setup="-S @MkWorldSetup@"
+
+for i in @DoingGHC@ @DoingHappy@ @DoingHaggis@ @DoingNoFib@ EndOfList ; do
+  if [ $i = nofib ] ; then
+     setup=$passed_in_setup
+  else
+     setup=''
+  fi
   if [ -d $i ] ; then
     ( set -e;                                                                  \
       cd $i ;                                                                  \
       echo '' ;                                                                        \
       echo "*** configuring $i ..." ;                                          \
-      make -f Makefile.BOOT BOOT_DEFINES="-P $i -S @MkWorldSetup@ -C mkworld -DTopDirPwd=$hardtop";    \
+      make -f Makefile.BOOT BOOT_DEFINES="-P $i $setup -C mkworld -DTopDirPwd=$hardtop"; \
       echo '' ;                                                                        \
       echo "*** making Makefiles in $i ..." ;                                  \
       make Makefile ;                                                          \
       make Makefiles                                                           \
     )
   else
-    echo warning: $i is not a directory -- doing nothing for it
+    if [ $i != EndOfList ] ; then
+       echo warning: $i is not a directory -- doing nothing for it
+    fi
   fi
 done
 
 # Finally, the dependencies
 
-for i in @DoingGHC@ @DoingHappy@ @DoingHaggis@ @DoingNoFib@ ; do
+for i in @DoingGHC@ @DoingHappy@ @DoingHaggis@ @DoingNoFib@ EndOfList ; do
   if [ -d $i ] ; then
     ( set -e;                                                                  \
       cd $i ;                                                                  \
@@ -93,7 +102,9 @@ for i in @DoingGHC@ @DoingHappy@ @DoingHaggis@ @DoingNoFib@ ; do
       make depend                                                              \
     )
   else
-    echo warning: $i is not a directory -- doing nothing for it
+    if [ $i != EndOfList ] ; then
+       echo warning: $i is not a directory -- doing nothing for it
+    fi
   fi
 done
 
@@ -101,14 +112,16 @@ echo ''
 echo '*******************************************************************'
 echo "* Looking good! All you should need to do now is...               *"
 echo '*                                                                 *'
-for i in @DoingGHC@ @DoingHappy@ @DoingHaggis@ @DoingNoFib@ ; do
-    echo "        cd $i"
-    if [ $i = nofib ] ; then
-       echo '        make all        # or...'
-       echo '        make runtests'
-    else
-       echo '        make all'
-       echo '        make install   # if you are so inclined...'
+for i in @DoingGHC@ @DoingHappy@ @DoingHaggis@ @DoingNoFib@ EndOfList ; do
+    if [ $i != EndOfList ] ; then
+       echo "        cd $i"
+       if [ $i = nofib ] ; then
+           echo '        make all        # or...'
+           echo '        make runtests'
+       else
+           echo '        make all'
+           echo '        make install   # if you are so inclined...'
+       fi
     fi
 done
 echo '*                                                                 *'