X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rules%2Fshell-wrapper.mk;h=c3358dfff60c5530221f028626d17db588db21b2;hb=071f080ab938648063db1e3c9e0b4d01e9621b1f;hp=dda78aa9ed6339fdea1b4c1785fc8decc366dad4;hpb=24e30dfa3fe0bb1efef01b1f216d9b5e45309f9c;p=ghc-hetmet.git

diff --git a/rules/shell-wrapper.mk b/rules/shell-wrapper.mk
index dda78aa..c3358df 100644
--- a/rules/shell-wrapper.mk
+++ b/rules/shell-wrapper.mk
@@ -32,6 +32,7 @@ endif
 ifneq "$$($1_$2_INSTALL_INPLACE)" "NO"
 all_$1_$2 : $$(INPLACE_BIN)/$$($1_$2_PROG)
 
+$$(INPLACE_BIN)/$$($1_$2_PROG): WRAPPER=$$@
 $$(INPLACE_BIN)/$$($1_$2_PROG): $$($1_$2_INPLACE)
 	"$$(RM)" $$(RM_OPTS)                              $$@
 	echo '#!$$(SHELL)'                             >> $$@
@@ -39,6 +40,8 @@ $$(INPLACE_BIN)/$$($1_$2_PROG): $$($1_$2_INPLACE)
 	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,7 +61,7 @@ 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)
+	$$(INSTALL_DIR) "$$(DESTDIR)$$(bindir)"
 	"$$(RM)" $$(RM_OPTS)                                        "$$(WRAPPER)"
 	$$(CREATE_SCRIPT)                                           "$$(WRAPPER)"
 	echo '#!$$(SHELL)'                                       >> "$$(WRAPPER)"
@@ -68,6 +71,8 @@ install_$1_$2_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)"