[project @ 2001-03-29 10:45:58 by simonmar]

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

diff --git a/distrib/Makefile-bin.in b/distrib/Makefile-bin.in
index 61c0cf5..5c7b22a 100644 (file)
--- a/distrib/Makefile-bin.in
+++ b/distrib/Makefile-bin.in
@@ -81,7 +81,7 @@ CHMOD       = chmod
 INSTALL            = @INSTALL@
 exeext      = @exeext@
 SED        = @SedCmd@
-TMPDIR      = /tmp
+DEFAULT_TMPDIR = /tmp
 
 # sigh
 INSTALL_DIR  = ./mkdirhier
@@ -91,7 +91,7 @@ INSTALL_DIR  = ./mkdirhier
 # to be created, i.e., create a symlink, ghc-$(version), pointing to ghc to
 # avoid version vertigo.
 #
-VERSION_SYMLINKS_FOR=$(package)
+VERSION_SYMLINKS_FOR=$(PACKAGE_LINKS)
 
 # Binaries to install
 PACKAGE_BIN_INSTALL=$(PACKAGE_PRL_SCRIPTS) $(PACKAGE_SH_SCRIPTS)
@@ -130,7 +130,7 @@ config-pkgs ::
           echo '$$'"libexecdir='$(libdir)';"       >> bin/$(platform)/$$i ; \
           echo '$$'"datadir='$(datadir)';"         >> bin/$(platform)/$$i ; \
           echo '$$'"SED='$(SED)';"                 >> bin/$(platform)/$$i ; \
-          echo '$$'"TMPDIR='$(TMPDIR)';"           >> bin/$(platform)/$$i ; \
+          echo '$$'"DEFAULT_TMPDIR='$(DEFAULT_TMPDIR)';" >> bin/$(platform)/$$i ; \
           cat bin/$(platform)/$$i.prl              >> bin/$(platform)/$$i ; \
           $(CHMOD) $(BIN_PERMS) bin/$(platform)/$$i; \
           echo "Done."; \
@@ -147,7 +147,7 @@ config-pkgs ::
           echo '$$'"libexecdir='$(libdir)';"      >> lib/$(platform)/$$i ; \
           echo '$$'"datadir='$(datadir)';"        >> lib/$(platform)/$$i ; \
           echo '$$'"SED='$(SED)';"                >> lib/$(platform)/$$i ; \
-          echo '$$'"TMPDIR='$(TMPDIR)';"          >> lib/$(platform)/$$i ; \
+          echo '$$'"DEFAULT_TMPDIR='$(DEFAULT_TMPDIR)';"  >> lib/$(platform)/$$i ; \
           cat lib/$(platform)/$$i.prl >> lib/$(platform)/$$i; \
           $(CHMOD) $(BIN_PERMS) lib/$(platform)/$$i; \
           echo "Done."; \
@@ -164,7 +164,7 @@ config-pkgs ::
           echo "libexecdir='$(libdir)'"        >> bin/$(platform)/$$i ; \
           echo "datadir='$(datadir)'"          >> bin/$(platform)/$$i ; \
           echo "SED='$(SED)'"                  >> bin/$(platform)/$$i ; \
-          echo "TMPDIR='$(TMPDIR)'"            >> bin/$(platform)/$$i ; \
+          echo "DEFAULT_TMPDIR='$(DEFAULT_TMPDIR)'" >> bin/$(platform)/$$i ; \
           cat bin/$(platform)/$$i.sh >> bin/$(platform)/$$i; \
           $(CHMOD) $(BIN_PERMS) bin/$(platform)/$$i; \
           echo "Done."; \
@@ -195,7 +195,7 @@ 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 $(VERSION_SYMLINKS_FOR) ""; do \
+       @for i in $(VERSION_SYMLINKS_FOR) ""; do \
           if [ "x$$i" != "x" ]; then           \
                ( cd $(bindir);                 \
                  if ( $(PERL) -e '$$fn="'$$i'"; exit ((! -f $$fn || -l $$fn) ? 0 : 1);' ); then \
@@ -240,7 +240,9 @@ install-info: install-dirs-info
        $(INSTALL_DATA) info/* $(infodir)
 
 install-html: install-dirs-html
-       $(INSTALL_DATA) html/* $(htmldir)
+       $(CP) -r html/* $(htmldir)
+       $(CHMOD) -R $(LIB_PERMS) $(htmldir)
+#      $(INSTALL_DATA) html/* $(htmldir)
 
 install-dirs-html:
        $(INSTALL_DIR) $(htmldir)