diff options
| author | Ian Lynagh <igloo@earth.li> | 2009-11-07 18:05:02 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2009-11-07 18:05:02 +0000 |
| commit | 24e30dfa3fe0bb1efef01b1f216d9b5e45309f9c (patch) | |
| tree | 4ff9f29a3cdfa85d4c2ff6db4b59eebea0c239b5 /rules | |
| parent | fef6fe2613ea03e5405f4b5aa38d4647df44b075 (diff) | |
| download | haskell-24e30dfa3fe0bb1efef01b1f216d9b5e45309f9c.tar.gz | |
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.
Diffstat (limited to 'rules')
| -rw-r--r-- | rules/shell-wrapper.mk | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/rules/shell-wrapper.mk b/rules/shell-wrapper.mk index 3f01286fe8..dda78aa9ed 100644 --- 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)" |