[Made the test suite and Haddock targets work out of the box on GHC 6.8.2. Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20080228160350] { hunk ./ChasingBottoms.cabal 16 -tested-with: GHC == 6.8.1 +tested-with: GHC == 6.8.2 hunk ./Makefile 18 -GHC_DOC_PATH ?= /chalmers/sw/unsup/ghc-6.8.1/share/doc/ghc/libraries +GHC_DOC_PATH ?= /usr/local/share/doc/ghc/libraries/ hunk ./Makefile 25 -GHC_68 ?= _ghc_6.8.1 +GHC_68 ?= ghc hunk ./Makefile 28 -PACKAGES = base-3.0.0.0 containers-0.1.0.0 random-1.0.0.0 mtl-1.1.0.0 \ +PACKAGES = base-3.0.1.0 containers-0.1.0.1 random-1.0.0.0 mtl-1.1.0.0 \ hunk ./Makefile 33 +# PKGS is PACKAGES but without the numeric suffices. Unfortunately +# PKGS=$(foreach pkg,$(PACKAGES),`echo $(pkg) | sed -r -e 's/-.*//'`) +# does not quite work, so I have resorted to the following ugly hack: + +PKGS=$(basename $(basename $(basename $(basename $(subst -,.,$(PACKAGES)))))) + hunk ./Makefile 60 - $(foreach pkg,$(PACKAGES),\ - -i$(GHC_DOC_URL)/$(pkg),$(GHC_DOC_PATH)/$(pkg)/`echo $(pkg) | sed -r -e 's/-.*//'`.haddock) \ + $(foreach pkg,$(PKGS),\ + -i$(GHC_DOC_URL)/$(pkg),$(GHC_DOC_PATH)/$(pkg)/$(pkg).haddock) \ }