X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=STARTUP.in;h=0416b7fe5058e331af481a80512257b2aeb5602d;hb=a7e6cdbfc4f27c2e0ab9c12ebe6431c246c74c6d;hp=d8b91710931663bdb3580c8c0a3cf517c08ab665;hpb=e7d21ee4f8ac907665a7e170c71d59e13a01da09;p=ghc-hetmet.git

diff --git a/STARTUP.in b/STARTUP.in
index d8b9171..0416b7f 100644
--- a/STARTUP.in
+++ b/STARTUP.in
@@ -30,15 +30,15 @@ esac
 
 for i in @DoingMkWorld@ @DoingGlaFpUtils@ @DoingLiterate@ ; do
   if [ -d $i ] ; then
-    ( set -e;									\
-      cd $i ;									\
-      echo '' ;									\
-      echo "*** configuring $i ..." ;						\
-      make -f Makefile.BOOT BOOT_DEFINES="-P none -S std -DTopDirPwd=$hardtop";	\
-      echo '' ;									\
-      echo "*** making Makefiles in $i ..." ;					\
-      make Makefile ; 								\
-      make Makefiles 								\
+    ( set -e;								\
+      cd $i ;								\
+      echo '' ;								\
+      echo "*** configuring $i ..." ;					\
+      @MakeCmd@ -f Makefile.BOOT BOOT_DEFINES="-P none -S std -DTopDirPwd=$hardtop";	\
+      echo '' ;								\
+      echo "*** making Makefiles in $i ..." ;				\
+      @MakeCmd@ Makefile ; 						\
+      @MakeCmd@ Makefiles 						\
     )
   else
     echo warning: $i is not a directory -- doing nothing for it
@@ -49,14 +49,14 @@ done
 
 for i in @DoingMkWorld@ @DoingGlaFpUtils@ @DoingLiterate@ ; do
   if [ -d $i ] ; then
-    ( set -e;									\
-      cd $i ;									\
-      echo '' ;									\
-      echo "*** making dependencies in $i ..." ;				\
-      make depend ;								\
-      echo '' ;									\
-      echo "*** making all in $i ..." ;						\
-      make all									\
+    ( set -e;								\
+      cd $i ;								\
+      echo '' ;								\
+      echo "*** making dependencies in $i ..." ;			\
+      @MakeCmd@ depend ;						\
+      echo '' ;								\
+      echo "*** making all in $i ..." ;					\
+      @MakeCmd@ all							\
     )
   else
     echo warning: $i is not a directory -- doing nothing for it
@@ -65,35 +65,46 @@ done
 
 # OK, now make the \`real' Makefiles
 
-for i in @DoingGHC@ @DoingHappy@ @DoingHaggis@ @DoingNoFib@ ; do
+passed_in_setup="-S @MkWorldSetup@"
+
+for i in @DoingGHC@ @DoingHsLibs@ @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";	\
-      echo '' ;									\
-      echo "*** making Makefiles in $i ..." ;					\
-      make Makefile ; 								\
-      make Makefiles 								\
+    ( set -e;								\
+      cd $i ;								\
+      echo '' ;								\
+      echo "*** configuring $i ..." ;					\
+      @MakeCmd@ -f Makefile.BOOT BOOT_DEFINES="-P $i $setup -C mkworld -DTopDirPwd=$hardtop"; \
+      echo '' ;								\
+      echo "*** making Makefiles in $i ..." ;				\
+      @MakeCmd@ Makefile ; 						\
+      @MakeCmd@ 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@ @DoingHsLibs@ @DoingHappy@ @DoingHaggis@ @DoingNoFib@ EndOfList ; do
   if [ -d $i ] ; then
-    ( set -e;									\
-      cd $i ;									\
-      echo '' ;									\
-      echo "*** making dependencies in $i ..." ;				\
-      make depend 								\
+    ( set -e;								\
+      cd $i ;								\
+      echo '' ;								\
+      echo "*** making dependencies in $i ..." ;			\
+      @MakeCmd@ 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@ @DoingHsLibs@ @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 '*                                                                 *'