Make our install variables etc compliant with GNU standards; fixes #1924

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

diff --git a/rules/shell-wrapper.mk b/rules/shell-wrapper.mk
index 312504e..9535a7d 100644 (file)
--- 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
@@ -58,14 +59,15 @@ install: 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=$$(libexecdir)/$$($1_$2_PROG)' >> $$(WRAPPER)
-       echo 'datadir=$$(datadir)'                  >> $$(WRAPPER)
-       echo 'bindir=$$(bindir)'                    >> $$(WRAPPER)
-       cat $$($1_$2_SHELL_WRAPPER_NAME)            >> $$(WRAPPER)
-       $$(EXECUTABLE_FILE)                            $$(WRAPPER)
+       "$$(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