X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rules%2Fshell-wrapper.mk;h=503a8d26e8c74e1575e6dcb223c960822c265d63;hb=f5b3f16c9321a1594ce1ed0b73914feabaa321a8;hp=9535a7d7203d80e9292ad698bc2e6b65f0d760bd;hpb=926ae90b75cd3368049854898062a563e57c9ad2;p=ghc-hetmet.git

diff --git a/rules/shell-wrapper.mk b/rules/shell-wrapper.mk
index 9535a7d..503a8d2 100644
--- a/rules/shell-wrapper.mk
+++ b/rules/shell-wrapper.mk
@@ -35,10 +35,12 @@ all_$1_$2 : $$(INPLACE_BIN)/$$($1_$2_PROG)
 $$(INPLACE_BIN)/$$($1_$2_PROG): $$($1_$2_INPLACE)
 	"$$(RM)" $$(RM_OPTS)                              $$@
 	echo '#!$$(SHELL)'                             >> $$@
-	echo 'executablename=$$(TOP)/$$<'              >> $$@
-	echo 'datadir=$$(TOP)/$$(INPLACE_LIB)'         >> $$@
-	echo 'bindir=$$(TOP)/$$(INPLACE_BIN)'          >> $$@
-	echo 'topdir=$$(TOP)/$$(INPLACE_TOPDIR)'       >> $$@
+	echo 'executablename="$$(TOP)/$$<"'            >> $$@
+	echo 'datadir="$$(TOP)/$$(INPLACE_LIB)"'       >> $$@
+	echo 'bindir="$$(TOP)/$$(INPLACE_BIN)"'        >> $$@
+	echo 'topdir="$$(TOP)/$$(INPLACE_TOPDIR)"'     >> $$@
+	$($1_$2_SHELL_WRAPPER_EXTRA)
+	$($1_$2_INPLACE_SHELL_WRAPPER_EXTRA)
 	cat $$($1_$2_SHELL_WRAPPER_NAME)               >> $$@
 	$$(EXECUTABLE_FILE)                               $$@
 endif
@@ -58,16 +60,20 @@ 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:
-	$$(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)
+	$$(INSTALL_DIR) "$$(DESTDIR)$$(bindir)"
+	"$$(RM)" $$(RM_OPTS)                                        "$$(WRAPPER)"
+	$$(CREATE_SCRIPT)                                           "$$(WRAPPER)"
+	echo '#!$$(SHELL)'                                       >> "$$(WRAPPER)"
+	echo 'exedir="$$(ghclibexecdir)"'                        >> "$$(WRAPPER)"
+	echo 'exeprog="$$($1_$2_PROG)"'                          >> "$$(WRAPPER)"
+	echo 'executablename="$$$$exedir/$$$$exeprog"'           >> "$$(WRAPPER)"
+	echo 'datadir="$$(datadir)"'                             >> "$$(WRAPPER)"
+	echo 'bindir="$$(bindir)"'                               >> "$$(WRAPPER)"
+	echo 'topdir="$$(topdir)"'                               >> "$$(WRAPPER)"
+	$($1_$2_SHELL_WRAPPER_EXTRA)
+	$($1_$2_INSTALL_SHELL_WRAPPER_EXTRA)
+	cat $$($1_$2_SHELL_WRAPPER_NAME)                         >> "$$(WRAPPER)"
+	$$(EXECUTABLE_FILE)                                         "$$(WRAPPER)"
 
 endif # $1_$2_INSTALL_SHELL_WRAPPER