X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rules%2Fshell-wrapper.mk;h=3f01286fe8f8102557d7c06640f7b7e9953fc6d5;hb=f65bf7559b3e92607cfcf7a334e9994891dd9c32;hp=742390b0298ae4a206500fd4fd642c1dd23f80e1;hpb=c59c053f0b8613dd128297ee0b6eef31f001c498;p=ghc-hetmet.git

diff --git a/rules/shell-wrapper.mk b/rules/shell-wrapper.mk
index 742390b..3f01286 100644
--- a/rules/shell-wrapper.mk
+++ b/rules/shell-wrapper.mk
@@ -16,7 +16,7 @@ define shell-wrapper
 
 ifeq "$$($1_$2_SHELL_WRAPPER)" "YES"
 
-ifeq "$(Windows)" "YES"
+ifeq "$$(Windows)" "YES"
 
 ifeq "$$($1_$2_INSTALL_SHELL_WRAPPER)" "YES"
 # Just install the binary on Windows
@@ -33,11 +33,12 @@ ifneq "$$($1_$2_INSTALL_INPLACE)" "NO"
 all_$1_$2 : $$(INPLACE_BIN)/$$($1_$2_PROG)
 
 $$(INPLACE_BIN)/$$($1_$2_PROG): $$($1_$2_INPLACE)
-	$$(RM) -f                                         $$@
+	"$$(RM)" $$(RM_OPTS)                              $$@
 	echo '#!$$(SHELL)'                             >> $$@
-	echo 'executablename=$$(TOP)/$$<'  >> $$@
-	echo 'datadir=$$(TOP)/$$(INPLACE_LIB)' >> $$@
-	echo 'bindir=$$(TOP)/$$(INPLACE_BIN)'  >> $$@
+	echo 'executablename="$$(TOP)/$$<"'            >> $$@
+	echo 'datadir="$$(TOP)/$$(INPLACE_LIB)"'       >> $$@
+	echo 'bindir="$$(TOP)/$$(INPLACE_BIN)"'        >> $$@
+	echo 'topdir="$$(TOP)/$$(INPLACE_TOPDIR)"'     >> $$@
 	cat $$($1_$2_SHELL_WRAPPER_NAME)               >> $$@
 	$$(EXECUTABLE_FILE)                               $$@
 endif
@@ -57,14 +58,16 @@ install: install_$1_$2_wrapper
 .PHONY: install_$1_$2_wrapper
 install_$1_$2_wrapper: WRAPPER=$$(DESTDIR)$$(bindir)/$$($1_$2_INSTALL_SHELL_WRAPPER_NAME)
 install_$1_$2_wrapper:
-	$$(MKDIRHIER) $$(DESTDIR)$$(bindir)
-	$$(RM) -f                                      $$(WRAPPER)
-	echo '#!$$(SHELL)'                          >> $$(WRAPPER)
-	echo 'executablename=$$(libexecdir)/$$($1_$2_PROG)' >> $$(WRAPPER)
-	echo 'datadir=$$(datadir)'                  >> $$(WRAPPER)
-	echo 'bindir=$$(bindir)'                    >> $$(WRAPPER)
-	cat $$($1_$2_SHELL_WRAPPER_NAME)            >> $$(WRAPPER)
-	$$(EXECUTABLE_FILE)                            $$(WRAPPER)
+	$$(INSTALL_DIR) $$(DESTDIR)$$(bindir)
+	"$$(RM)" $$(RM_OPTS)                                        "$$(WRAPPER)"
+	$$(CREATE_SCRIPT)                                           "$$(WRAPPER)"
+	echo '#!$$(SHELL)'                                       >> "$$(WRAPPER)"
+	echo 'executablename="$$(ghclibexecdir)/$$($1_$2_PROG)"' >> "$$(WRAPPER)"
+	echo 'datadir="$$(datadir)"'                             >> "$$(WRAPPER)"
+	echo 'bindir="$$(bindir)"'                               >> "$$(WRAPPER)"
+	echo 'topdir="$$(topdir)"'                               >> "$$(WRAPPER)"
+	cat $$($1_$2_SHELL_WRAPPER_NAME)                         >> "$$(WRAPPER)"
+	$$(EXECUTABLE_FILE)                                         "$$(WRAPPER)"
 
 endif # $1_$2_INSTALL_SHELL_WRAPPER