X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=distrib%2FMakefile-bin.in;h=2175b7490321d81e089dfdd7328972503f2c970c;hb=4417e97d436e2796bed886cb1a830acb88d3da28;hp=0d28672bfa644209103200dd0960e032845b1ad3;hpb=b61bba9198fc3e1563fb9581f7b3caeae0230f21;p=ghc-hetmet.git

diff --git a/distrib/Makefile-bin.in b/distrib/Makefile-bin.in
index 0d28672..2175b74 100644
--- a/distrib/Makefile-bin.in
+++ b/distrib/Makefile-bin.in
@@ -169,10 +169,16 @@ config-pkgs ::
 	@for i in $(PACKAGE_LIB_SPLICED_FILES) ""; do \
 	  if test "$$i"; then \
 	    echo "Creating a configured version of $$i .."; \
-	   if [ -f lib/$(platform)/$$i ]; then $(MV) lib/$(platform)/$$i lib/$(platform)/$$i.bak; fi; \
-	   $(SED) -e "s|\$$libdir|$(libdir)|g;s|\$$datadir|$(datadir)|g" <lib/$(platform)/$$i.bak >lib/$(platform)/$$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
@@ -223,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); 		\