Only in cabal-1.1.4: dist Only in cabal-1.1.4: .installed-pkg-config diff -ur tmp/cabal-1.1.4/Makefile cabal-1.1.4/Makefile --- tmp/cabal-1.1.4/Makefile 2006-05-01 19:41:33.000000000 +0100 +++ cabal-1.1.4/Makefile 2006-07-26 19:37:47.000000000 +0100 @@ -9,13 +9,11 @@ #KIND=latest GHCFLAGS= --make -Wall -fno-warn-unused-matches -cpp # later: -Wall -PREF=/usr/local +PREFIX=/usr/local USER_FLAG = GHCPKGFLAGS = -#HCBASE=/tmp/ghc/bin/ -HCBASE=/usr/bin/ -HC=$(HCBASE)ghc -HC_PKG=$(HCBASE)/ghc-pkg +HC=ghc +HC_PKG=ghc-pkg # Comment out this line if your system doesn't have System.Posix. ISPOSIX=-DHAVE_UNIX_PACKAGE @@ -40,7 +38,7 @@ hmake -nhc98 -package base -prelude Setup config: setup - ./setup configure --ghc --prefix=$(PREF) + ./setup configure --ghc --prefix=$(PREFIX) build: build-stamp build-stamp: config @@ -95,16 +93,16 @@ remove: remove-cabal remove-hunit remove-cabal: -$(HC_PKG) $(GHCPKGFLAGS) -r Cabal - -rm -rf $(PREF)/lib/Cabal-0.1 + -rm -rf $(PREFIX)/lib/Cabal-0.1 remove-hunit: -$(HC_PKG) $(GHCPKGFLAGS) -r HUnit - -rm -rf $(PREF)/lib/HUnit-1.0 + -rm -rf $(PREFIX)/lib/HUnit-1.0 # dependencies (included): hunit: hunit-stamp hunit-stamp: - cd tests/HUnit-1.0 && make && ./setup configure --prefix=$(PREF) && ./setup build + cd tests/HUnit-1.0 && make && ./setup configure --prefix=$(PREFIX) && ./setup build touch $@ hunitInstall: hunitInstall-stamp Only in cabal-1.1.4: Makefile~ diff -ur tmp/cabal-1.1.4/runTests.sh cabal-1.1.4/runTests.sh --- tmp/cabal-1.1.4/runTests.sh 2006-05-01 19:12:45.000000000 +0100 +++ cabal-1.1.4/runTests.sh 2006-07-26 19:35:09.000000000 +0100 @@ -1,7 +1,6 @@ #!/bin/sh -HCBASE=/usr/bin/ -HC=$HCBASE/ghc +HC=ghc GHCFLAGS='--make -Wall -fno-warn-unused-matches -cpp' ISPOSIX=-DHAVE_UNIX_PACKAGE Only in cabal-1.1.4: runTests.sh~ Only in cabal-1.1.4: setup Only in cabal-1.1.4: .setup-config