diff options
| author | Ian Lynagh <igloo@earth.li> | 2009-11-07 18:36:14 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2009-11-07 18:36:14 +0000 |
| commit | f5b3f16c9321a1594ce1ed0b73914feabaa321a8 (patch) | |
| tree | ff9568aaad7fd55b1803f01e2bf1d97b0e14f693 /rules/shell-wrapper.mk | |
| parent | 24e30dfa3fe0bb1efef01b1f216d9b5e45309f9c (diff) | |
| download | haskell-f5b3f16c9321a1594ce1ed0b73914feabaa321a8.tar.gz | |
ghc-stage2 is now renamed to ghc when it is installed
This means that we get the right program name in error messages etc.
Diffstat (limited to 'rules/shell-wrapper.mk')
| -rw-r--r-- | rules/shell-wrapper.mk | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/rules/shell-wrapper.mk b/rules/shell-wrapper.mk index dda78aa9ed..503a8d26e8 100644 --- a/rules/shell-wrapper.mk +++ b/rules/shell-wrapper.mk @@ -39,6 +39,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) cat $$($1_$2_SHELL_WRAPPER_NAME) >> $$@ $$(EXECUTABLE_FILE) $$@ endif @@ -58,7 +60,7 @@ install: install_$1_$2_wrapper .PHONY: 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) + $$(INSTALL_DIR) "$$(DESTDIR)$$(bindir)" "$$(RM)" $$(RM_OPTS) "$$(WRAPPER)" $$(CREATE_SCRIPT) "$$(WRAPPER)" echo '#!$$(SHELL)' >> "$$(WRAPPER)" @@ -68,6 +70,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) cat $$($1_$2_SHELL_WRAPPER_NAME) >> "$$(WRAPPER)" $$(EXECUTABLE_FILE) "$$(WRAPPER)" |