diff options
| author | Simon Marlow <marlowsd@gmail.com> | 2011-04-12 13:30:02 +0100 |
|---|---|---|
| committer | Simon Marlow <marlowsd@gmail.com> | 2011-05-28 11:14:57 +0100 |
| commit | d30d47e5a819a7900054dd089b21d769259fdffa (patch) | |
| tree | 4a81aab983f5c762a6eee990e1cf9f9dc0940e97 /utils/runghc/ghc.mk | |
| parent | e8832eb9f05ca46d9315250c3baf7010eb0630a4 (diff) | |
| download | haskell-d30d47e5a819a7900054dd089b21d769259fdffa.tar.gz | |
Make builds that use stage1 use "dist-install" consistently. This
makes it easier to remove everything built with stage1 in cases where
the build system or GHC wrongly thinks everything is up to date.
Diffstat (limited to 'utils/runghc/ghc.mk')
| -rw-r--r-- | utils/runghc/ghc.mk | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/utils/runghc/ghc.mk b/utils/runghc/ghc.mk index 26c3b31228..7c6a34a190 100644 --- a/utils/runghc/ghc.mk +++ b/utils/runghc/ghc.mk @@ -11,19 +11,19 @@ # ----------------------------------------------------------------------------- utils/runghc_PACKAGE = runghc -utils/runghc_dist_USES_CABAL = YES -utils/runghc_dist_PROG = runghc$(exeext) -utils/runghc_dist_SHELL_WRAPPER = YES -utils/runghc_dist_INSTALL_SHELL_WRAPPER = YES -utils/runghc_dist_EXTRA_HC_OPTS = -cpp -DVERSION="\"$(ProjectVersion)\"" +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_EXTRA_HC_OPTS = -cpp -DVERSION="\"$(ProjectVersion)\"" ifneq "$(BINDIST)" "YES" # hack: the build system has trouble with Main modules not called Main.hs -utils/runghc/dist/build/Main.hs : utils/runghc/runghc.hs | $$(dir $$@)/. +utils/runghc/dist-install/build/Main.hs : utils/runghc/runghc.hs | $$(dir $$@)/. "$(CP)" $< $@ endif -$(eval $(call build-prog,utils/runghc,dist,1)) +$(eval $(call build-prog,utils/runghc,dist-install,1)) install: install_runhaskell |