additions from Reilly Hayes

[ghc-hetmet.git] / distrib / Makefile-bin.in

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