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

diff --git a/distrib/Makefile-bin.in b/distrib/Makefile-bin.in
index 9a06b94..6df1e05 100644
--- a/distrib/Makefile-bin.in
+++ b/distrib/Makefile-bin.in
@@ -166,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); \
@@ -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..."
@@ -253,7 +271,11 @@ show-install-setup:
 
 install-docs : install-dirs-docs
 	if test -d share/html ; then $(CP) -r share/html/* $(htmldir) ; fi
-	if test -f share/*.ps ; then $(CP) share/*.ps $(psdir) ; fi
+	for i in share/*.ps; do \
+		if test -f "$$i"; then \
+		      $(CP) $$i $(psdir) ; \
+		fi \
+	done
 
 install-dirs-docs:
 	$(INSTALL_DIR) $(htmldir)