[project @ 1997-10-14 13:23:54 by simonm]

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

diff --git a/distrib/Makefile-bin.in b/distrib/Makefile-bin.in
index f7775e2..f07aacc 100644 (file)
--- a/distrib/Makefile-bin.in
+++ b/distrib/Makefile-bin.in
@@ -143,6 +143,8 @@ config-pkgs ::
           echo $$"libdir='$(real_libdir)';"                   >> bin/$(platform)/$(package)-$(version)/$$i ; \
           echo $$"libexecdir='$(real_libdir)';"               >> bin/$(platform)/$(package)-$(version)/$$i ; \
           echo $$"datadir='$(real_datadir)';"                 >> bin/$(platform)/$(package)-$(version)/$$i ; \
+          echo $$"SED='$(SED)';"               >> bin/$(platform)/$(package)-$(version)/$$i ; \
+          echo $$"RAWCPP='$(RAWCPP)';"         >> bin/$(platform)/$(package)-$(version)/$$i ; \
           cat bin/$(platform)/$(package)-$(version)/$$i.prl   >> bin/$(platform)/$(package)-$(version)/$$i ; \
           $(CHMOD) $(BIN_PERMS) bin/$(platform)/$(package)-$(version)/$$i; \
           echo "Done."; \
@@ -167,10 +169,12 @@ config-pkgs ::
           $(RM) bin/$(platform)/$(package)-$(version)/$$i.bak; \
           test -f bin/$(platform)/$(package)-$(version)/$$i && $(MV) bin/$(platform)/$(package)-$(version)/$$i bin/$(platform)/$(package)-$(version)/$$i.bak; \
           echo "#! $(SH)"                      > bin/$(platform)/$(package)-$(version)/$$i ; \
-          echo "bindir='$(bindir)';"          >> bin/$(platform)/$(package)-$(version)/$$i ; \
-          echo "libdir='$(real_libdir)';"     >> bin/$(platform)/$(package)-$(version)/$$i ; \
-          echo "libexecdir='$(real_libdir)';" >> bin/$(platform)/$(package)-$(version)/$$i ; \
-          echo "datadir='$(real_datadir)';"   >> bin/$(platform)/$(package)-$(version)/$$i ; \
+          echo "bindir='$(bindir)'"          >> bin/$(platform)/$(package)-$(version)/$$i ; \
+          echo "libdir='$(real_libdir)'"     >> bin/$(platform)/$(package)-$(version)/$$i ; \
+          echo "libexecdir='$(real_libdir)'" >> bin/$(platform)/$(package)-$(version)/$$i ; \
+          echo "datadir='$(real_datadir)'"   >> bin/$(platform)/$(package)-$(version)/$$i ; \
+          echo "SED='$(SED)'"                   >> bin/$(platform)/$(package)-$(version)/$$i ; \
+          echo "RAWCPP='$(RAWCPP)'"             >> bin/$(platform)/$(package)-$(version)/$$i ; \
           cat bin/$(platform)/$(package)-$(version)/$$i.sh >> bin/$(platform)/$(package)-$(version)/$$i; \
           $(CHMOD) $(BIN_PERMS) bin/$(platform)/$(package)-$(version)/$$i; \
           echo "Done."; \
@@ -178,15 +182,11 @@ config-pkgs ::
 
 
 mk-version-symlinks ::
-       @for i in $(VERSION_SYMLINKS_FOR) ""; do        \
-         if [ "x$$i" != "x" ]; then                    \
-            echo "Symlinking $$i to $$i-$(version)";   \
-            (cd bin/$(platform)/$(package)-$(version); \
-             $(RM)   $$i-$(version);                   \
-              $(MV)   $$i $$i-$(version);              \
-             $(LN_S) $$i-$(version) $$i                \
-            );                                         \
-         fi;                                           \
+       @for i in $(VERSION_SYMLINKS_FOR) ""; do \
+         if [ "x$$i" != "x" ]; then \
+            echo "Symlinking $$i to $$i-$(version)"; \
+            (cd bin/$(platform)/$(package)-$(version); $(RM) $$i-$(version); $(LN_S) $$i $$i-$(version) ); \
+         fi;\
        done
 
 in-place ::
@@ -208,9 +208,13 @@ install-bin:
           $(INSTALL_BIN) bin/$(platform)/$(package)-$(version)/$$i $(bindir); \
        done;
        for i in $(VERSION_SYMLINKS_FOR) ""; do \
-          if [ "x$$i" != "x" ]; then \
-               ( cd $(bindir); $(LN_S) $$i $$i-$(version) ); \
-          fi; \
+          if [ "x$$i" != "x" ]; then           \
+               ( cd $(bindir);                 \
+                 $(RM) $$i-$(version);         \
+                 $(MV) $$i $$i-$(version);     \
+                 $(LN_S) $$i-$(version) $$i    \
+               );                              \
+          fi;                                  \
        done