add :cmd

[ghc-hetmet.git] / utils / Makefile

diff --git a/utils/Makefile b/utils/Makefile
index 9416d77..a6f5f9a 100644 (file)
--- a/utils/Makefile
+++ b/utils/Makefile
@@ -1,14 +1,14 @@
 TOP=..
 include $(TOP)/mk/boilerplate.mk
 
-ifneq "$(BIN_DIST_NAME)" ""
+ifeq "$(MAKING_BIN_DIST)" "1"
 # We're doing a binary-dist, descend into a subset of the dirs.
 SUBDIRS = hp2ps unlit
 else
 ifeq "$(BootingFromHc)" "YES"
 SUBDIRS = mkdependC mkdirhier runstdtest genapply genprimopcode ghc-pkg unlit
 else
-SUBDIRS = mkdependC mkdirhier runstdtest ghc-pkg hasktags hp2ps hsc2hs lndir \
+SUBDIRS = mkdependC mkdirhier runstdtest ghc-pkg hasktags hp2ps hsc2hs \
          parallel prof unlit genprimopcode genapply runghc
 endif
 endif
@@ -17,6 +17,11 @@ ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
 SUBDIRS += touchy
 endif
 
+ifneq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
+# lndir doesn't build on Windows
+SUBDIRS += lndir
+endif
+
 # Utils that we don't build by default:
 #      nofib-analyse
 
@@ -37,3 +42,10 @@ endif
 #  a Haskell compiler and if you want it.
 
 include $(TOP)/mk/target.mk
+
+# genprimopcode is needed to boot in ghc/compiler...
+ifneq "$(BootingFromHc)" "YES"
+boot ::
+       $(MAKE) -C genprimopcode
+endif
+