X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=distrib%2FMakefile-bin.in;h=6df1e056d8ad176af0d4ba4900b820ef4031b6d3;hp=4f81e71dfabec494a057a84e21cc7b8c44e705e1;hb=a3e027a34f5e956da3875ab629aa2427e520f879;hpb=42d54ccdc9a1000c36fdbf66088c6714bf8d69a2

diff --git a/distrib/Makefile-bin.in b/distrib/Makefile-bin.in
index 4f81e71..6df1e05 100644
--- a/distrib/Makefile-bin.in
+++ b/distrib/Makefile-bin.in
@@ -44,10 +44,6 @@
 #  * psdir
 #     where to install the Postscript documentation files.
 #
-# Installing the documentation is not done as part of the `install' rule, but
-# via `install-docs' (or if you want to be selective: `install-html', `install-dvi'
-# and `install-info').
-#
 # For more complete instructions, consult the INSTALL file
 # that came with the bundle, and/or consult the installation
 # documentation in one of the document directories.
@@ -66,7 +62,7 @@ prefix      = @prefix@
 exec_prefix = @exec_prefix@
 
 # default
-htmldir     = $(datadir)
+htmldir     = $(datadir)/html
 psdir       = $(datadir)
 pdfdir      = $(datadir)
 
@@ -170,10 +166,23 @@ config-pkgs ::
 	   echo "Done."; \
 	  fi; \
 	done
+	@for i in $(PACKAGE_LIB_SPLICED_FILES) ""; do \
+	  if test "$$i"; then \
+	    echo "Creating a configured version of $$i .."; \
+            $(PERL) -i.bak -lpe 's|\$$libdir|$(libdir)|g;s|\$$datadir|$(datadir)|g' lib/$(platform)/$$i; \
+          fi; \
+	done
+	@if test "$(platform)" = "powerpc-apple-darwin"; then \
+	  echo "Configuring install names..."; \
+	  for i in lib/$(platform)/*; do \
+	    sh fix_install_names.sh "$(libdir)" "$$i"; \
+	  done; \
+	  echo "Done."; \
+	fi
 
 in-place ::
 	$(MAKE) $(MFLAGS) config-pkgs bindir=`pwd`/bin/$(platform) libdir=`pwd`/lib/$(platform) datadir=`pwd`/share
-	if test -x "./post-inplace-script" ; then \
+	@if test -x "./post-inplace-script" ; then \
 		echo "Running project-specific post-inplace script ..." ; \
 		./post-inplace-script $(platform) `pwd` \
 			$(package)-$(version); \
@@ -194,8 +203,12 @@ denounce:
 	@echo
 	@echo =======================================================================
 	@echo Installation of $(package)-$(version) was successful.
+	@echo
 	@echo To use, add $(bindir) to your PATH.
-	@if test -d html ; then \
+	@echo
+	@if test -f share/html/index.html; then \
+	   echo For documentation, see $(htmldir)/index.html ; \
+	elif test -d share/html ; then \
 	   echo Docs can be found in $(htmldir). ; \
 	else \
 	   echo "Warning: this binary distribution does NOT contain documentation!" ; \
@@ -216,6 +229,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 ! -f "$(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); 		\
@@ -237,7 +253,9 @@ install-libs:
 	(cd lib/$(platform); find . -type f -exec sh -c '$(CP) $$0 $(libdir)/$$0' {} \; )
 
 install-datas:
-	(cd share; find . -type f -exec sh -c '$(INSTALL_DATA) $$0 $(datadir)/$$0' {} \; )
+	for i in `(cd share; find . -type f )`; do \
+	   $(INSTALL_DATA) share/$$i $(datadir)/$$i; \
+	done
 
 show-install-setup:
 	@echo "Install setup..."
@@ -252,8 +270,12 @@ show-install-setup:
 .PHONY: show-install-setup install-docs install-dirs-docs
 
 install-docs : install-dirs-docs
-	if test -d html ; then $(CP) -r html/* $(htmldir) ; fi
-	if test -f ps/*.ps ; then $(CP) ps/*.ps $(psdir) ; fi
+	if test -d share/html ; then $(CP) -r share/html/* $(htmldir) ; fi
+	for i in share/*.ps; do \
+		if test -f "$$i"; then \
+		      $(CP) $$i $(psdir) ; \
+		fi \
+	done
 
 install-dirs-docs:
 	$(INSTALL_DIR) $(htmldir)