From 24e30dfa3fe0bb1efef01b1f216d9b5e45309f9c Mon Sep 17 00:00:00 2001 From: Ian Lynagh Date: Sat, 7 Nov 2009 18:05:02 +0000 Subject: [PATCH] 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. --- rules/shell-wrapper.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/rules/shell-wrapper.mk b/rules/shell-wrapper.mk index 3f01286..dda78aa 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)" -- 1.7.10.4