diff options
| author | Ian Lynagh <ian@well-typed.com> | 2012-09-27 01:57:19 +0100 |
|---|---|---|
| committer | Ian Lynagh <ian@well-typed.com> | 2012-09-27 02:01:11 +0100 |
| commit | 6e6da3a0d7cc227fadfd0dec6660364b265eb2ad (patch) | |
| tree | 74475f2852c0948aabfa6a1ff8244f914420b840 /utils | |
| parent | 7724ecb713eb67ddd6c53ffe6ceca9fd6607cefa (diff) | |
| download | haskell-6e6da3a0d7cc227fadfd0dec6660364b265eb2ad.tar.gz | |
Tweak the build system handling of shell wrappers
Rather than having a separate
foo_INSTALL_SHELL_WRAPPER
variable, we just use
foo_INSTALL && foo_SHELL_WRAPPER
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/ghc-pkg/ghc.mk | 2 | ||||
| -rw-r--r-- | utils/runghc/ghc.mk | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/utils/ghc-pkg/ghc.mk b/utils/ghc-pkg/ghc.mk index ba553d29e9..68c63e2a1f 100644 --- a/utils/ghc-pkg/ghc.mk +++ b/utils/ghc-pkg/ghc.mk @@ -96,7 +96,7 @@ utils/ghc-pkg_PACKAGE = ghc-pkg utils/ghc-pkg_$(GHC_PKG_DISTDIR)_PROG = ghc-pkg utils/ghc-pkg_$(GHC_PKG_DISTDIR)_SHELL_WRAPPER = YES -utils/ghc-pkg_$(GHC_PKG_DISTDIR)_INSTALL_SHELL_WRAPPER = YES +utils/ghc-pkg_$(GHC_PKG_DISTDIR)_INSTALL = YES utils/ghc-pkg_$(GHC_PKG_DISTDIR)_INSTALL_SHELL_WRAPPER_NAME = ghc-pkg-$(ProjectVersion) utils/ghc-pkg_$(GHC_PKG_DISTDIR)_INSTALL_INPLACE = NO diff --git a/utils/runghc/ghc.mk b/utils/runghc/ghc.mk index 128987daf6..6ff84f0c62 100644 --- a/utils/runghc/ghc.mk +++ b/utils/runghc/ghc.mk @@ -14,7 +14,7 @@ utils/runghc_PACKAGE = runghc utils/runghc_dist-install_USES_CABAL = YES utils/runghc_dist-install_PROG = runghc$(exeext) utils/runghc_dist-install_SHELL_WRAPPER = YES -utils/runghc_dist-install_INSTALL_SHELL_WRAPPER = YES +utils/runghc_dist-install_INSTALL = YES utils/runghc_dist-install_INSTALL_SHELL_WRAPPER_NAME = runghc-$(ProjectVersion) utils/runghc_dist-install_EXTRA_HC_OPTS = -cpp -DVERSION="\"$(ProjectVersion)\"" |