X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=5c4baa27a2058795438e20fa94bd2ffc7ee46b9c;hb=3d7f51b9c6b157f31f46623bfbd2408aafe137ab;hp=71bd7160d4cf027b8715d94ff002d84df5dbe53e;hpb=f5f6465e1acd6bee1d9705e8807e6c4e72d04e28;p=ghc-hetmet.git

diff --git a/Makefile b/Makefile
index 71bd716..5c4baa2 100644
--- a/Makefile
+++ b/Makefile
@@ -55,18 +55,19 @@ BIN_DIST_TOP= distrib/Makefile-bin.in \
 
 binary-dist::
 	@for i in $(BIN_DIST_TOP); do \
-	  if [ -e $$i ]; then \
+	  if test -f "$$i"; then \
 	     echo cp $$i $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME); \
 	     cp $$i $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME); \
 	  fi; \
 	done;
 	@echo "Configuring the Makefile for this project..."
 	touch $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile.in
-	echo "project = $(ProjectNameShort)" >> $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile.in
+	echo "package = $(ProjectNameShort)" >> $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile.in
 	echo "version = $(ProjectVersion)" >> $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile.in
 	echo "PACKAGE_SH_SCRIPTS = $($(Project)BinDistShScripts)" >> $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile.in
 	echo "PACKAGE_PRL_SCRIPTS = $($(Project)BinDistPrlScripts)" >> $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile.in
 	echo "PACKAGE_LIB_PRL_SCRIPTS = $($(Project)BinDistLibPrlScripts)" >> $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile.in
+	echo "PACKAGE_BINS = $($(Project)BinDistBins)" >> $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile.in
 	cat $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile-bin.in >> $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile.in
 	@echo "Generating a shippable configure script.."
 	$(MV) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/configure-bin.in $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/configure.in 
@@ -95,19 +96,29 @@ binary-dist ::
 # Rename scripts to $i.prl and $i.sh where necessary.
 # ToDo: do this in a cleaner way...
 
+ifneq "$($(Project)BinDistPrlScripts)" ""
 binary-dist::
 	@for i in $($(Project)BinDistPrlScripts); do \
 	     echo "Renaming $$i to $$i.prl"; \
 	    $(MV) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/bin/$(TARGETPLATFORM)/$(ProjectNameShort)-$(ProjectVersion)/$$i  $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/bin/$(TARGETPLATFORM)/$(ProjectNameShort)-$(ProjectVersion)/$$i.prl; \
 	done
+endif
+
+ifneq "$($(Project)BinDistLibPrlScripts)" ""
+binary-dist::
 	@for i in $($(Project)BinDistLibPrlScripts); do \
 	     echo "Renaming $$i to $$i.prl"; \
 	    $(MV) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/lib/$(TARGETPLATFORM)/$(ProjectNameShort)-$(ProjectVersion)/$$i  $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/lib/$(TARGETPLATFORM)/$(ProjectNameShort)-$(ProjectVersion)/$$i.prl; \
 	done
+endif
+
+ifneq "$($(Project)BinDistShScripts)" ""
+binary-dist::
 	@for i in $($(Project)BinDistShScripts); do \
 	     echo "Renaming $$i to $$i.sh"; \
 	    $(MV) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/bin/$(TARGETPLATFORM)/$(ProjectNameShort)-$(ProjectVersion)/$$i  $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/bin/$(TARGETPLATFORM)/$(ProjectNameShort)-$(ProjectVersion)/$$i.sh; \
 	done
+endif
 
 dist :: dist-pre
 include $(TOP)/mk/target.mk