X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rules%2Fshell-wrapper.mk;h=9535a7d7203d80e9292ad698bc2e6b65f0d760bd;hb=f96194794bf099020706c3816d1a5678b40addbb;hp=acdb06e72d86243f19220fc6c9fb8d46f5a40827;hpb=0ef6ba7b28187a4bf5309f9702eeaf53a281204b;p=ghc-hetmet.git

diff --git a/rules/shell-wrapper.mk b/rules/shell-wrapper.mk
index acdb06e..9535a7d 100644
--- a/rules/shell-wrapper.mk
+++ b/rules/shell-wrapper.mk
@@ -38,6 +38,7 @@ $$(INPLACE_BIN)/$$($1_$2_PROG): $$($1_$2_INPLACE)
 	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)" $$(RM_OPTS)                           $$(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