diff options
| author | Ian Lynagh <igloo@earth.li> | 2009-05-16 00:11:18 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2009-05-16 00:11:18 +0000 |
| commit | d346b2e9f580c872305a4619a28a9536f8ba8082 (patch) | |
| tree | b1d7e63bc5525e080aeb15379eb76648b8acd328 | |
| parent | 95613f10aecf62b020425cbce1d719b01d0f2cf8 (diff) | |
| download | haskell-d346b2e9f580c872305a4619a28a9536f8ba8082.tar.gz | |
Remove some $(TOP)s that cause problems on Windows (as they contain ':')
| -rw-r--r-- | docs/users_guide/ghc.mk | 2 | ||||
| -rw-r--r-- | utils/ghc-cabal/ghc.mk | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/docs/users_guide/ghc.mk b/docs/users_guide/ghc.mk index 25cd001c96..6d9b275503 100644 --- a/docs/users_guide/ghc.mk +++ b/docs/users_guide/ghc.mk @@ -23,7 +23,7 @@ $(eval $(call docbook,docs/users_guide,users_guide)) # tree. This is a horrible hack, but I can't find a better way to do # it --SDM (2009-05-11) -build_ug_book = $(TOP)/docs/users_guide/ug-book.xml +build_ug_book = docs/users_guide/ug-book.xml src_ug_book = $(dir $(realpath $(dir $(build_ug_book))/ug-book.xml.in))ug-book.xml ifneq "$(build_ug_book)" "$(src_ug_book)" diff --git a/utils/ghc-cabal/ghc.mk b/utils/ghc-cabal/ghc.mk index 4ffab8b00c..b73d413bcf 100644 --- a/utils/ghc-cabal/ghc.mk +++ b/utils/ghc-cabal/ghc.mk @@ -54,7 +54,7 @@ $(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) $(TOP)/mk/config.mk +$(GHC_CABAL_DIR)/dist-dummy-ghc/build/dummy-ghc.hs : $(GHC_CABAL_DIR)/ghc.mk $(MKDIRHIER) mk/config.mk $(MKDIRHIER) $(dir $@) echo "import System.Environment; import System.Cmd; import System.Exit" >$@ echo "main = do args <- getArgs; if args == [\"--numeric-version\"] then putStrLn \"$(ProjectVersion)\" else do e <- rawSystem \"$(GHC_STAGE0)\" args; exitWith e" >>$@ |