Tweak the shell wrapper scripts

We now separate the executable path from the executable name.
This will allow us to change one but not the other easily.

diff --git a/rules/shell-wrapper.mk b/rules/shell-wrapper.mk
index 3f01286..dda78aa 100644 (file)
--- a/rules/shell-wrapper.mk
+++ b/rules/shell-wrapper.mk
@@ -62,7 +62,9 @@ install_$1_$2_wrapper:
        "$$(RM)" $$(RM_OPTS)                                        "$$(WRAPPER)"
        $$(CREATE_SCRIPT)                                           "$$(WRAPPER)"
        echo '#!$$(SHELL)'                                       >> "$$(WRAPPER)"
-       echo 'executablename="$$(ghclibexecdir)/$$($1_$2_PROG)"' >> "$$(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)"