From: simonmar <unknown>
Date: Tue, 8 Mar 2005 11:56:57 +0000 (+0000)
Subject: [project @ 2005-03-08 11:56:55 by simonmar]
X-Git-Tag: Initial_conversion_from_CVS_complete~948
X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=commitdiff_plain;h=bc0eeca8c0e49ff50d5a2d154e486009aae97187

[project @ 2005-03-08 11:56:55 by simonmar]
Allow for optional binary installation
---

diff --git a/Makefile b/Makefile
index da862f1..4f900d5 100644
--- a/Makefile
+++ b/Makefile
@@ -269,6 +269,7 @@ binary-dist::
 	echo "PACKAGE_LIB_PRL_SCRIPTS = $($(Project)BinDistLibPrlScripts)" >> $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile.in
 	echo "PACKAGE_LIB_SPLICED_FILES = $($(Project)BinDistLibSplicedFiles)" >> $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile.in
 	echo "PACKAGE_BINS = $($(Project)BinDistBins)" >> $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile.in
+	echo "PACKAGE_OPT_BINS = $($(Project)BinDistOptBins)" >> $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile.in
 	echo "PACKAGE_LINKS = $($(Project)BinDistLinks)" >> $(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.."
diff --git a/distrib/Makefile-bin.in b/distrib/Makefile-bin.in
index 0d28672..f4497da 100644
--- a/distrib/Makefile-bin.in
+++ b/distrib/Makefile-bin.in
@@ -223,6 +223,9 @@ install-bin:
 	for i in $(PACKAGE_BINS) ""; do \
 	   if test -n "$$i" ; then $(INSTALL_BIN) bin/$(platform)/$$i$(exeext) $(bindir); fi; \
 	done;
+	for i in $(PACKAGE_OPT_BINS) ""; do \
+	   if test -n "$$i" -a ! -e "$(bindir)/$$i" ; then $(INSTALL_BIN) bin/$(platform)/$$i$(exeext) $(bindir); fi; \
+	done;
 	@for i in $(VERSION_SYMLINKS_FOR) ""; do \
 	   if [ "x$$i" != "x" ]; then 		\
 	   	( cd $(bindir); 		\