diff options
| author | Ian Lynagh <igloo@earth.li> | 2009-11-07 20:50:42 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2009-11-07 20:50:42 +0000 |
| commit | b4bd9a58ae93e60e535cf64cff0a1a6b7c771881 (patch) | |
| tree | ec678555f460bfce327e0d85d1cee8b2aea389b6 /rules/shell-wrapper.mk | |
| parent | f5b3f16c9321a1594ce1ed0b73914feabaa321a8 (diff) | |
| download | haskell-b4bd9a58ae93e60e535cf64cff0a1a6b7c771881.tar.gz | |
Tweak how shell wrappers are built
Diffstat (limited to 'rules/shell-wrapper.mk')
| -rw-r--r-- | rules/shell-wrapper.mk | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/rules/shell-wrapper.mk b/rules/shell-wrapper.mk index 503a8d26e8..c3358dfff6 100644 --- a/rules/shell-wrapper.mk +++ b/rules/shell-wrapper.mk @@ -32,6 +32,7 @@ endif ifneq "$$($1_$2_INSTALL_INPLACE)" "NO" all_$1_$2 : $$(INPLACE_BIN)/$$($1_$2_PROG) +$$(INPLACE_BIN)/$$($1_$2_PROG): WRAPPER=$$@ $$(INPLACE_BIN)/$$($1_$2_PROG): $$($1_$2_INPLACE) "$$(RM)" $$(RM_OPTS) $$@ echo '#!$$(SHELL)' >> $$@ @@ -39,8 +40,8 @@ $$(INPLACE_BIN)/$$($1_$2_PROG): $$($1_$2_INPLACE) echo 'datadir="$$(TOP)/$$(INPLACE_LIB)"' >> $$@ echo 'bindir="$$(TOP)/$$(INPLACE_BIN)"' >> $$@ echo 'topdir="$$(TOP)/$$(INPLACE_TOPDIR)"' >> $$@ - $($1_$2_SHELL_WRAPPER_EXTRA) - $($1_$2_INPLACE_SHELL_WRAPPER_EXTRA) + $$($1_$2_SHELL_WRAPPER_EXTRA) + $$($1_$2_INPLACE_SHELL_WRAPPER_EXTRA) cat $$($1_$2_SHELL_WRAPPER_NAME) >> $$@ $$(EXECUTABLE_FILE) $$@ endif @@ -70,8 +71,8 @@ install_$1_$2_wrapper: echo 'datadir="$$(datadir)"' >> "$$(WRAPPER)" echo 'bindir="$$(bindir)"' >> "$$(WRAPPER)" echo 'topdir="$$(topdir)"' >> "$$(WRAPPER)" - $($1_$2_SHELL_WRAPPER_EXTRA) - $($1_$2_INSTALL_SHELL_WRAPPER_EXTRA) + $$($1_$2_SHELL_WRAPPER_EXTRA) + $$($1_$2_INSTALL_SHELL_WRAPPER_EXTRA) cat $$($1_$2_SHELL_WRAPPER_NAME) >> "$$(WRAPPER)" $$(EXECUTABLE_FILE) "$$(WRAPPER)" |