diff options
| author | Ian Lynagh <ian@well-typed.com> | 2013-03-03 22:49:41 +0000 |
|---|---|---|
| committer | Ian Lynagh <ian@well-typed.com> | 2013-03-03 22:52:50 +0000 |
| commit | 2b85372ca18115bb1d6363256fcea6f54e415bed (patch) | |
| tree | 1ccbbac74ddbb89430cc07cbdedd9b48a5a44662 /utils/ghc-pkg | |
| parent | 8640750e136f98767fc0678b35a20a6fb7970241 (diff) | |
| download | haskell-2b85372ca18115bb1d6363256fcea6f54e415bed.tar.gz | |
Automatically add the $(exeext) to program names
We now define _PROGNAME, and _PROG is automatically defined with
$(exeext). This will shortly automatically use the right exeext
depending on what stage it is being compiled with (exeext may be
different for different stages when cross-compiling).
Diffstat (limited to 'utils/ghc-pkg')
| -rw-r--r-- | utils/ghc-pkg/ghc.mk | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/utils/ghc-pkg/ghc.mk b/utils/ghc-pkg/ghc.mk index 4464ba1cde..51c3cb4c36 100644 --- a/utils/ghc-pkg/ghc.mk +++ b/utils/ghc-pkg/ghc.mk @@ -34,14 +34,12 @@ utils/ghc-pkg_dist_SHELL_WRAPPER = YES utils/ghc-pkg_dist_INSTALL_SHELL_WRAPPER_NAME = ghc-pkg-$(ProjectVersion) utils/ghc-pkg_dist_WANT_INSTALLED_WRAPPER = YES -INSTALL_LIBEXECS += utils/ghc-pkg/dist/build/tmp/$(utils/ghc-pkg_dist_PROG) - $(eval $(call shell-wrapper,utils/ghc-pkg,dist)) endif utils/ghc-pkg_dist_USES_CABAL = YES -utils/ghc-pkg_dist_PROG = ghc-pkg$(exeext) +utils/ghc-pkg_dist_PROGNAME = ghc-pkg utils/ghc-pkg_dist_SHELL_WRAPPER = YES utils/ghc-pkg_dist_INSTALL_INPLACE = YES @@ -59,7 +57,7 @@ ifneq "$(Stage1Only)" "YES" utils/ghc-pkg_dist-install_USES_CABAL = YES -utils/ghc-pkg_dist-install_PROG = ghc-pkg +utils/ghc-pkg_dist-install_PROGNAME = ghc-pkg utils/ghc-pkg_dist-install_SHELL_WRAPPER = YES utils/ghc-pkg_dist-install_INSTALL = YES utils/ghc-pkg_dist-install_INSTALL_SHELL_WRAPPER_NAME = ghc-pkg-$(ProjectVersion) |