Fix some more build bugs exposed by the addition of the ghc dependency to dph

[ghc-hetmet.git] / rules / shell-wrapper.mk

diff --git a/rules/shell-wrapper.mk b/rules/shell-wrapper.mk
index acdb06e..3f01286 100644 (file)
--- a/rules/shell-wrapper.mk
+++ b/rules/shell-wrapper.mk
@@ -35,9 +35,10 @@ 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 '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