Fix bindist creation

Bindists should now work again, when doing "make install" at least.
"make in-place" is probably still broken.

13 files changed, 85 insertions, 9 deletions

diff --git a/utils/Makefile b/utils/Makefile
index a6f5f9af2e..276a736990 100644
--- a/utils/Makefile
+++ b/utils/Makefile
@@ -1,9 +1,9 @@
 TOP=..
 include $(TOP)/mk/boilerplate.mk
 
-ifeq "$(MAKING_BIN_DIST)" "1"
+ifeq "$(DOING_BIN_DIST)" "YES"
 # We're doing a binary-dist, descend into a subset of the dirs.
-SUBDIRS = hp2ps unlit
+SUBDIRS = mkdirhier ghc-pkg hasktags hp2ps hsc2hs parallel prof unlit runghc
 else
 ifeq "$(BootingFromHc)" "YES"
 SUBDIRS = mkdependC mkdirhier runstdtest genapply genprimopcode ghc-pkg unlit
@@ -11,17 +11,16 @@ else
 SUBDIRS = mkdependC mkdirhier runstdtest ghc-pkg hasktags hp2ps hsc2hs \
 	  parallel prof unlit genprimopcode genapply runghc
 endif
+ifneq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
+# lndir doesn't build on Windows
+SUBDIRS += lndir
+endif
 endif
 
 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
 
@@ -41,6 +40,11 @@ endif
 #  unlikely to want it desperately.  It is easy to build once you have
 #  a Haskell compiler and if you want it.
 
+binary-dist:
+	$(INSTALL_DIR)           $(BIN_DIST_DIR)/utils
+	$(INSTALL_DATA) Makefile $(BIN_DIST_DIR)/utils/
+	set -e; for d in $(SUBDIRS); do $(MAKE) -C $$d binary-dist; done
+
 include $(TOP)/mk/target.mk
 
 # genprimopcode is needed to boot in ghc/compiler...
diff --git a/utils/ghc-pkg/Makefile b/utils/ghc-pkg/Makefile
index e4c8b74948..f3ebafcbba 100644
--- a/utils/ghc-pkg/Makefile
+++ b/utils/ghc-pkg/Makefile
@@ -90,4 +90,9 @@ boot :: depend
 	$(MAKE) all
 endif
 
+binary-dist:
+	$(INSTALL_DIR)                $(BIN_DIST_DIR)/utils/ghc-pkg
+	$(INSTALL_DATA)    Makefile   $(BIN_DIST_DIR)/utils/ghc-pkg/
+	$(INSTALL_PROGRAM) $(HS_PROG) $(BIN_DIST_DIR)/utils/ghc-pkg/
+
 include $(TOP)/mk/target.mk
diff --git a/utils/hasktags/Makefile b/utils/hasktags/Makefile
index 99afec685d..c3178aca47 100644
--- a/utils/hasktags/Makefile
+++ b/utils/hasktags/Makefile
@@ -7,4 +7,9 @@ CLEAN_FILES += Main.hi
 
 INSTALL_PROGS += $(HS_PROG)
 
+binary-dist:
+	$(INSTALL_DIR)                $(BIN_DIST_DIR)/utils/hasktags
+	$(INSTALL_DATA)    Makefile   $(BIN_DIST_DIR)/utils/hasktags/
+	$(INSTALL_PROGRAM) $(HS_PROG) $(BIN_DIST_DIR)/utils/hasktags/
+
 include $(TOP)/mk/target.mk
diff --git a/utils/hp2ps/Makefile b/utils/hp2ps/Makefile
index 18cb05b1bd..7952bbb961 100644
--- a/utils/hp2ps/Makefile
+++ b/utils/hp2ps/Makefile
@@ -11,4 +11,9 @@ LIBS	     = $(LIBM)
 
 CLEAN_FILES += $(C_OBJS) $(C_PROG)
 
+binary-dist:
+	$(INSTALL_DIR)               $(BIN_DIST_DIR)/utils/hp2ps
+	$(INSTALL_DATA)    Makefile  $(BIN_DIST_DIR)/utils/hp2ps/
+	$(INSTALL_PROGRAM) $(C_PROG) $(BIN_DIST_DIR)/utils/hp2ps/
+
 include $(TOP)/mk/target.mk
diff --git a/utils/hsc2hs/Makefile b/utils/hsc2hs/Makefile
index 38be1f4d71..dedabb3c9c 100644
--- a/utils/hsc2hs/Makefile
+++ b/utils/hsc2hs/Makefile
@@ -79,4 +79,11 @@ endif
 override datadir=$(libdir)
 INSTALL_DATAS += template-hsc.h
 
+binary-dist:
+	$(INSTALL_DIR)                      $(BIN_DIST_DIR)/utils/hsc2hs
+	$(INSTALL_DATA)    Makefile         $(BIN_DIST_DIR)/utils/hsc2hs/
+	$(INSTALL_DATA)    hsc2hs.sh        $(BIN_DIST_DIR)/utils/hsc2hs/
+	$(INSTALL_DATA)    $(INSTALL_DATAS) $(BIN_DIST_DIR)/utils/hsc2hs/
+	$(INSTALL_PROGRAM) $(HS_PROG)       $(BIN_DIST_DIR)/utils/hsc2hs/
+
 include $(TOP)/mk/target.mk
diff --git a/utils/mkdirhier/Makefile b/utils/mkdirhier/Makefile
index 1190557655..1e044e49b0 100644
--- a/utils/mkdirhier/Makefile
+++ b/utils/mkdirhier/Makefile
@@ -11,4 +11,9 @@ all::
 	cat $(PROG).sh                                 >> $(PROG)
 	$(EXECUTABLE_FILE) $(PROG)
 
+binary-dist:
+	$(INSTALL_DIR)              $(BIN_DIST_DIR)/utils/mkdirhier
+	$(INSTALL_DATA)    Makefile $(BIN_DIST_DIR)/utils/mkdirhier/
+	$(INSTALL_PROGRAM) $(PROG)  $(BIN_DIST_DIR)/utils/mkdirhier/
+
 include $(TOP)/mk/target.mk
diff --git a/utils/parallel/Makefile b/utils/parallel/Makefile
index b297de04c5..78bf6f0637 100644
--- a/utils/parallel/Makefile
+++ b/utils/parallel/Makefile
@@ -21,8 +21,15 @@ PERL_PROGS = \
 
 BASH_PROGS = gr2ps gr2jv gr2ap gr2gran
 
-$(PERL_INSTALLERS) = $(addprefix install.perl.,$(PERL_PROGS))
-$(BASH_INSTALLERS) = $(addprefix install.bash.,$(BASH_PROGS))
+else
+
+PERL_PROGS =
+BASH_PROGS =
+
+endif
+
+PERL_INSTALLERS = $(addprefix install.perl.,$(PERL_PROGS))
+BASH_INSTALLERS = $(addprefix install.bash.,$(BASH_PROGS))
 
 .PHONY: install.perl.%
 .PHONY: install.bash.%
@@ -40,6 +47,13 @@ $(BASH_INSTALLERS): install.bash.%:
 	echo "#!$(BASH)" >> $(bindir)/$*
 	cat $*.bash      >> $(bindir)/$*
 	$(EXECUTABLE_FILE)  $(bindir)/$*
+
+binary-dist:
+	$(INSTALL_DIR)                                   $(BIN_DIST_DIR)/utils/parallel
+	$(INSTALL_DATA) Makefile                         $(BIN_DIST_DIR)/utils/parallel/
+ifeq "$(INSTALL_PARALLEL_SCRIPTS)" "YES"
+	$(INSTALL_DATA) $(addsuffix .pl,$(PERL_PROGS))   $(BIN_DIST_DIR)/utils/parallel/
+	$(INSTALL_DATA) $(addsuffix .bash,$(BASH_PROGS)) $(BIN_DIST_DIR)/utils/parallel/
 endif
 
 include $(TOP)/mk/target.mk
diff --git a/utils/prof/Makefile b/utils/prof/Makefile
index 28e6f50bd6..4401c630a3 100644
--- a/utils/prof/Makefile
+++ b/utils/prof/Makefile
@@ -27,4 +27,10 @@ install::
 	cat ghcprof.prl                                 >> $(INSTALLED_SCRIPT)
 	$(EXECUTABLE_FILE) $(INSTALLED_SCRIPT)
 
+binary-dist:
+	$(INSTALL_DIR)              $(BIN_DIST_DIR)/utils/prof
+	$(INSTALL_DATA) Makefile    $(BIN_DIST_DIR)/utils/prof/
+	$(INSTALL_DATA) ghcprof.prl $(BIN_DIST_DIR)/utils/prof/
+	set -e; for d in $(SUBDIRS); do $(MAKE) -C $$d binary-dist; done
+
 include $(TOP)/mk/target.mk
diff --git a/utils/prof/cgprof/Makefile b/utils/prof/cgprof/Makefile
index 17c567537a..bac0ab7d21 100644
--- a/utils/prof/cgprof/Makefile
+++ b/utils/prof/cgprof/Makefile
@@ -6,4 +6,9 @@ INSTALL_LIBEXECS=$(C_PROG)
 
 SRC_CC_OPTS += -Wall -I$(GHC_INCLUDE_DIR)
 
+binary-dist:
+	$(INSTALL_DIR)            $(BIN_DIST_DIR)/utils/prof/cgprof
+	$(INSTALL_DATA) Makefile  $(BIN_DIST_DIR)/utils/prof/cgprof/
+	$(INSTALL_DATA) $(C_PROG) $(BIN_DIST_DIR)/utils/prof/cgprof/
+
 include $(TOP)/mk/target.mk
diff --git a/utils/prof/icons/Makefile b/utils/prof/icons/Makefile
index fde1b16d3a..bc125ac75c 100644
--- a/utils/prof/icons/Makefile
+++ b/utils/prof/icons/Makefile
@@ -4,4 +4,9 @@ include $(TOP)/mk/boilerplate.mk
 override datadir=$(libdir)/icons
 INSTALL_DATAS=$(wildcard *.xbm)
 
+binary-dist:
+	$(INSTALL_DIR)                   $(BIN_DIST_DIR)/utils/prof/icons
+	$(INSTALL_DATA) Makefile         $(BIN_DIST_DIR)/utils/prof/icons/
+	$(INSTALL_DATA) $(INSTALL_DATAS) $(BIN_DIST_DIR)/utils/prof/icons/
+
 include $(TOP)/mk/target.mk
diff --git a/utils/runghc/Makefile b/utils/runghc/Makefile
index f210b004f3..1a176a084a 100644
--- a/utils/runghc/Makefile
+++ b/utils/runghc/Makefile
@@ -15,4 +15,9 @@ include $(GHC_COMPAT_DIR)/compat.mk
 # we must also build with $(GhcHcOpts) here:
 SRC_HC_OPTS += $(GhcHcOpts) $(GhcStage1HcOpts)
 
+binary-dist:
+	$(INSTALL_DIR)                $(BIN_DIST_DIR)/utils/runghc
+	$(INSTALL_DATA)    Makefile   $(BIN_DIST_DIR)/utils/runghc/
+	$(INSTALL_PROGRAM) $(HS_PROG) $(BIN_DIST_DIR)/utils/runghc/
+
 include $(TOP)/mk/target.mk
diff --git a/utils/touchy/Makefile b/utils/touchy/Makefile
index d2430df162..0c580cfd43 100644
--- a/utils/touchy/Makefile
+++ b/utils/touchy/Makefile
@@ -18,3 +18,8 @@ include $(TOP)/mk/target.mk
 # Get it over with!
 boot :: all
 
+binary-dist:
+	$(INSTALL_DIR)               $(BIN_DIST_DIR)/utils/touchy
+	$(INSTALL_DATA)    Makefile  $(BIN_DIST_DIR)/utils/touchy/
+	$(INSTALL_PROGRAM) $(C_PROG) $(BIN_DIST_DIR)/utils/touchy/
+
diff --git a/utils/unlit/Makefile b/utils/unlit/Makefile
index 15e7fc4252..dfa1b8db60 100644
--- a/utils/unlit/Makefile
+++ b/utils/unlit/Makefile
@@ -13,4 +13,9 @@ boot :: all
 #
 INSTALL_LIBEXECS += $(C_PROG)
 
+binary-dist:
+	$(INSTALL_DIR)               $(BIN_DIST_DIR)/utils/unlit
+	$(INSTALL_DATA)    Makefile  $(BIN_DIST_DIR)/utils/unlit/
+	$(INSTALL_PROGRAM) $(C_PROG) $(BIN_DIST_DIR)/utils/unlit/
+
 include $(TOP)/mk/target.mk