diff options
| author | Simon Marlow <marlowsd@gmail.com> | 2009-05-29 15:19:34 +0000 |
|---|---|---|
| committer | Simon Marlow <marlowsd@gmail.com> | 2009-05-29 15:19:34 +0000 |
| commit | 52ed0609e8583a607676527d737ea1ba754deb3c (patch) | |
| tree | d4c1520853e884f3a4e737497a4d6221c1fd9b47 /utils | |
| parent | fce6c28071259f68ec0be5bb53abd2ee36123e92 (diff) | |
| download | haskell-52ed0609e8583a607676527d737ea1ba754deb3c.tar.gz | |
depend on mk/project.mk appropriately
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/ghc-cabal/ghc.mk | 4 | ||||
| -rw-r--r-- | utils/ghc-pkg/ghc.mk | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/utils/ghc-cabal/ghc.mk b/utils/ghc-cabal/ghc.mk index 6ae87e5cc3..c41cd01cd8 100644 --- a/utils/ghc-cabal/ghc.mk +++ b/utils/ghc-cabal/ghc.mk @@ -53,8 +53,8 @@ $(eval $(call all-target,$(GHC_CABAL_DIR),$(GHC_CABAL_INPLACE))) $(GHC_CABAL_DIR)_dist-dummy-ghc_MODULES = dummy-ghc $(GHC_CABAL_DIR)_dist-dummy-ghc_PROG = dummy-ghc$(exeext) -# depend on config.mk, so we pick up the new version number if it changes. -$(GHC_CABAL_DIR)/dist-dummy-ghc/build/dummy-ghc.hs : $(GHC_CABAL_DIR)/ghc.mk $(MKDIRHIER) mk/config.mk +# depend on project.mk, so we pick up the new version number if it changes. +$(GHC_CABAL_DIR)/dist-dummy-ghc/build/dummy-ghc.hs : $(GHC_CABAL_DIR)/ghc.mk $(MKDIRHIER) mk/project.mk "$(MKDIRHIER)" $(dir $@) echo "import System.Environment; import System.Cmd; import System.Exit" >$@ echo "main :: IO ()" >>$@ diff --git a/utils/ghc-pkg/ghc.mk b/utils/ghc-pkg/ghc.mk index 0c99661ec6..289c67c328 100644 --- a/utils/ghc-pkg/ghc.mk +++ b/utils/ghc-pkg/ghc.mk @@ -61,7 +61,7 @@ utils/ghc-pkg/dist/build/$(utils/ghc-pkg_dist_PROG)$(exeext): utils/ghc-pkg/Main -ilibraries/extensible-exceptions \ -ilibraries/hpc -utils/ghc-pkg/Version.hs: mk/config.mk +utils/ghc-pkg/Version.hs: mk/project.mk "$(RM)" $(RM_OPTS) $@ echo "module Version where" >> $@ echo "version, targetOS, targetARCH :: String" >> $@ |