X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=distrib%2FMakefile-bin.in;h=197a2e1675dd281a848a21d045562a10c57d2f91;hb=3eaf13137ab87e4d6c3404fa0895b49a2a1b93cf;hp=09b6d6608cb7f49e9edbe39937234242d95053c8;hpb=c830ae13ccd7373b5478e10382a57d497ebc6a40;p=ghc-hetmet.git

diff --git a/distrib/Makefile-bin.in b/distrib/Makefile-bin.in
index 09b6d66..197a2e1 100644
--- a/distrib/Makefile-bin.in
+++ b/distrib/Makefile-bin.in
@@ -170,10 +170,16 @@ config-pkgs ::
 	  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; \
+	   $(SED) -e "s|\$$libdir|$(libdir)|g;s|\$$datadir|$(datadir)|g" <lib/$(platform)/$$i.bak >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
@@ -224,6 +230,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); 		\