From 2de31b61d0a963803eb5632c9659c6093d74f345 Mon Sep 17 00:00:00 2001
From: Ian Lynagh <igloo@earth.li>
Date: Sun, 10 Aug 2008 00:50:16 +0000
Subject: bindists are now some way towards working

---
 utils/Makefile               | 15 +++++++++------
 utils/genapply/Makefile      |  3 +++
 utils/genprimopcode/Makefile |  3 +++
 utils/hp2ps/Makefile         |  6 ++----
 utils/mkdependC/Makefile     |  3 +++
 utils/mkdirhier/Makefile     |  6 ++----
 utils/parallel/Makefile      | 10 +++-------
 utils/runstdtest/Makefile    |  3 +++
 utils/unlit/Makefile         |  6 ++----
 9 files changed, 30 insertions(+), 25 deletions(-)

(limited to 'utils')

diff --git a/utils/Makefile b/utils/Makefile
index a6d39cca5d..6dc6838b34 100644
--- a/utils/Makefile
+++ b/utils/Makefile
@@ -42,11 +42,6 @@ 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...
@@ -57,7 +52,7 @@ endif
 
 WITH_BOOTSTRAPPING_COMPILER = installPackage ghc-pkg hsc2hs hpc
 
-WITH_STAGE1 = installPackage ghc-pkg hasktags runghc hpc
+WITH_STAGE1 = installPackage ghc-pkg hasktags runghc hpc pwd
 ifneq "$(NO_INSTALL_HSC2HS)" "YES"
 WITH_STAGE1 += hsc2hs
 endif
@@ -65,6 +60,10 @@ endif
 # sort removes duplicates - we don't actually care about the order
 WITH_EITHER = $(sort $(WITH_BOOTSTRAPPING_COMPILER) $(WITH_STAGE1))
 
+binary-dist: $(foreach P,$(WITH_STAGE1),binary-dist.$P)
+	echo $(WHERE_AM_I)/Makefile >> $(BIN_DIST_LIST)
+	set -e; for d in $(SUBDIRS); do $(MAKE) -C $$d binary-dist WHERE_AM_I=$(WHERE_AM_I)/$$d; done
+
 clean distclean:: $(foreach P,$(WITH_EITHER),clean.$P)
 
 with-bootstrapping-compiler: \
@@ -90,3 +89,7 @@ $(foreach P,$(WITH_STAGE1),install.$P): \
 install.%:
 	$(MAKE) -C $* install
 
+$(foreach P,$(WITH_STAGE1),binary-dist.$P): \
+binary-dist.%:
+	$(MAKE) -C $* binary-dist WHERE_AM_I=$(WHERE_AM_I)/$*
+
diff --git a/utils/genapply/Makefile b/utils/genapply/Makefile
index 64489db1ac..a017547c70 100644
--- a/utils/genapply/Makefile
+++ b/utils/genapply/Makefile
@@ -27,4 +27,7 @@ GenApply.o : $(GHC_INCLUDE_DIR)/ghcconfig.h
 GenApply.o : $(GHC_INCLUDE_DIR)/MachRegs.h
 GenApply.o : $(GHC_INCLUDE_DIR)/Constants.h
 
+binary-dist:
+	@:
+
 include $(TOP)/mk/target.mk
diff --git a/utils/genprimopcode/Makefile b/utils/genprimopcode/Makefile
index 20c409a422..ed011eb0c2 100644
--- a/utils/genprimopcode/Makefile
+++ b/utils/genprimopcode/Makefile
@@ -3,5 +3,8 @@ include $(TOP)/mk/boilerplate.mk
 
 HS_PROG = genprimopcode
 
+binary-dist:
+	@:
+
 include $(TOP)/mk/target.mk
 
diff --git a/utils/hp2ps/Makefile b/utils/hp2ps/Makefile
index 09c193f1c1..93aa856ffc 100644
--- a/utils/hp2ps/Makefile
+++ b/utils/hp2ps/Makefile
@@ -14,9 +14,7 @@ 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/
+BINDIST_EXTRAS += $(C_PROG)
+include $(TOP)/mk/bindist.mk
 
 include $(TOP)/mk/target.mk
diff --git a/utils/mkdependC/Makefile b/utils/mkdependC/Makefile
index 9c00c09018..432c8981e4 100644
--- a/utils/mkdependC/Makefile
+++ b/utils/mkdependC/Makefile
@@ -18,4 +18,7 @@ all::
 	cat $(PROG).prl                                >> $(PROG)
 	$(EXECUTABLE_FILE) $(PROG)
 
+binary-dist:
+	@:
+
 include $(TOP)/mk/target.mk
diff --git a/utils/mkdirhier/Makefile b/utils/mkdirhier/Makefile
index 9dbbb9b6c1..0e32bbbde4 100644
--- a/utils/mkdirhier/Makefile
+++ b/utils/mkdirhier/Makefile
@@ -11,9 +11,7 @@ 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_SCRIPT) $(PROG)  $(BIN_DIST_DIR)/utils/mkdirhier/
+BINDIST_EXTRAS += $(PROG)
+include $(TOP)/mk/bindist.mk
 
 include $(TOP)/mk/target.mk
diff --git a/utils/parallel/Makefile b/utils/parallel/Makefile
index 78bf6f0637..50909c68e1 100644
--- a/utils/parallel/Makefile
+++ b/utils/parallel/Makefile
@@ -48,12 +48,8 @@ $(BASH_INSTALLERS): install.bash.%:
 	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
+BINDIST_EXTRAS += $(addsuffix .pl,$(PERL_PROGS))
+BINDIST_EXTRAS += $(addsuffix .bash,$(BASH_PROGS))
+include $(TOP)/mk/bindist.mk
 
 include $(TOP)/mk/target.mk
diff --git a/utils/runstdtest/Makefile b/utils/runstdtest/Makefile
index 5003bf79aa..e9cb75119d 100644
--- a/utils/runstdtest/Makefile
+++ b/utils/runstdtest/Makefile
@@ -12,4 +12,7 @@ all::
 	cat $(PROG).prl                                >> $(PROG)
 	$(EXECUTABLE_FILE) $(PROG)
 
+binary-dist:
+	@:
+
 include $(TOP)/mk/target.mk
diff --git a/utils/unlit/Makefile b/utils/unlit/Makefile
index 6323129511..1723a08e26 100644
--- a/utils/unlit/Makefile
+++ b/utils/unlit/Makefile
@@ -19,9 +19,7 @@ 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/
+BINDIST_EXTRAS += $(C_PROG)
+include $(TOP)/mk/bindist.mk
 
 include $(TOP)/mk/target.mk
-- 
cgit v1.2.1