X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=distrib%2FMakefile-bin.in;h=7da408ccf618066c272646b8fce852c2abbf35da;hb=8a42a90d764fa45e490e969e5b64c944a57db5bd;hp=61c0cf5e81aba9e6f95928fc8b03b76a3f0b8910;hpb=67fe852eb2e9b3a489b62cbf9259b5a868db5468;p=ghc-hetmet.git

diff --git a/distrib/Makefile-bin.in b/distrib/Makefile-bin.in
index 61c0cf5..7da408c 100644
--- 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
@@ -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."; \
@@ -240,7 +240,9 @@ install-info: install-dirs-info
 	$(INSTALL_DATA) info/* $(infodir)
 
 install-html: install-dirs-html
-	$(INSTALL_DATA) html/* $(htmldir)
+	$(CHMOD) -R $(LIB_PERMS) html/*
+	$(CP) -r html/* $(htmldir)
+#	$(INSTALL_DATA) html/* $(htmldir)
 
 install-dirs-html:
 	$(INSTALL_DIR) $(htmldir)