From 54cf53b0895e140d73a684e8cf56a1719a499367 Mon Sep 17 00:00:00 2001
From: sewardj <unknown>
Date: Tue, 3 Apr 2001 11:31:39 +0000
Subject: [PATCH] [project @ 2001-04-03 11:31:38 by sewardj] Make binary-dist
 installations work, by generating a proper package.conf
 file.  This is done by allowing fptools packages to supply
 an arbitrary post-install shell script, which the bin-dist
 'make install' runs last of all.  In Project=Ghc's case,
 the post-install script runs pkgconf with appropriate
 params to create the package.conf file in the right place.

---
 distrib/Makefile-bin.in |   16 ++++++++++++----
 ghc/driver/Makefile     |    3 ++-
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/distrib/Makefile-bin.in b/distrib/Makefile-bin.in
index 5c7b22a..0c7f1b6 100644
--- a/distrib/Makefile-bin.in
+++ b/distrib/Makefile-bin.in
@@ -184,9 +184,17 @@ install-dirs ::
 	(cd lib/$(platform); find . -type d -exec sh -c '../../$(INSTALL_DIR) $$0 $(libdir)/$$0' {} \; )
 	(cd share; find . -type d -exec sh -c '../$(INSTALL_DIR) $(datadir)/$$0' {} \; )
 
-install :: config-pkgs install-dirs install-bin install-libs install-datas
+install :: config-pkgs install-dirs install-bin install-libs install-datas postinstall
 
-.PHONY: install-bin install-libs install-datas
+.PHONY: install-bin install-libs install-datas postinstall
+
+postinstall:
+	if test -x "bin/$(platform)/post-install-script" ; then \
+		echo "Running project-specific post-install script ..." ; \
+		bin/$(platform)/post-install-script $(platform) $(prefix) \
+			$(package)-$(version); \
+		echo "Done" ; \
+	fi
 
 install-bin:
 	for i in $(PACKAGE_BIN_INSTALL) ""; do \
@@ -199,11 +207,11 @@ install-bin:
 	   if [ "x$$i" != "x" ]; then 		\
 	   	( cd $(bindir); 		\
 		  if ( $(PERL) -e '$$fn="'$$i'"; exit ((! -f $$fn || -l $$fn) ? 0 : 1);' ); then \
-	   	     echo "Creating a symbol link from $$i-$(version) to $$i"; \
+	   	     echo "Creating a symbolic link from $$i-$(version) to $$i"; \
 	   	     $(RM) $$i; \
 	             $(LN_S) $$i-$(version) $$i; \
 	          else \
-	             echo "Creating a symbol link from $$i-$(version) to $$i failed: \`$$i' already exists"; \
+	             echo "Creating a symbolic link from $$i-$(version) to $$i failed: \`$$i' already exists"; \
 	             echo "Perhaps remove \`$$i' manually?"; \
 	             exit 1; \
 	          fi;\
diff --git a/ghc/driver/Makefile b/ghc/driver/Makefile
index 79f6307..ef11e08 100644
--- a/ghc/driver/Makefile
+++ b/ghc/driver/Makefile
@@ -1,5 +1,5 @@
 #-----------------------------------------------------------------------------
-# $Id: Makefile,v 1.59 2001/03/31 10:28:42 panne Exp $
+# $Id: Makefile,v 1.60 2001/04/03 11:31:39 sewardj Exp $
 #
 
 TOP=..
@@ -55,6 +55,7 @@ Package.o : ../utils/ghc-pkg/Package.hs
 
 override datadir = $(libdir)
 INSTALL_DATAS += package.conf ghc-usage.txt
+INSTALL_PROGS += pkgconf post-install-script
 
 CLEAN_FILES += pkgconf package.conf.inplace package.conf
 
-- 
1.7.10.4