--- haskell-devscripts/hlibrary.mk.orig	2010-03-09 16:45:43.000000000 -0800
+++ haskell-devscripts/hlibrary.mk	2010-05-07 04:40:31.395792759 -0700
@@ -78,15 +78,16 @@
 	if test ! -e Setup.lhs -a ! -e Setup.hs; then echo "No setup script found!"; exit 1; fi
 	for setup in Setup.lhs Setup.hs; do if test -e $$setup; then ghc --make $$setup -o $(DEB_SETUP_BIN_NAME); exit 0; fi; done
 
-dist-ghc: $(DEB_SETUP_BIN_NAME)
+dist-ghc/dist-ghc-stamp: $(DEB_SETUP_BIN_NAME)
 	$(DEB_SETUP_BIN_NAME) configure --ghc -v2 \
 		--prefix=/usr --libdir=/usr/lib/haskell-packages/ghc/lib \
 		--builddir=dist-ghc \
 		--haddockdir=$(DEB_HADDOCK_DIR) \
 		--htmldir=$(DEB_HADDOCK_HTML_DIR) $(ENABLE_PROFILING) \
 		$(DEB_SETUP_GHC6_CONFIGURE_ARGS) $(OPTIMIZATION)
+	touch $@
 
-build-ghc-stamp: dist-ghc
+build-ghc-stamp: dist-ghc/dist-ghc-stamp
 	$(BUILD_GHC6) --builddir=dist-ghc
 	touch build-ghc-stamp
 
@@ -96,7 +97,7 @@
 	[ ! -x /usr/bin/haddock ] || $(DEB_SETUP_BIN_NAME) haddock --builddir=dist-ghc $(DEB_HADDOCK_OPTS)
 	touch build-haddock-stamp
 
-build/haskell-$(CABAL_PACKAGE)-doc build/libghc-$(CABAL_PACKAGE)-doc:: dist-ghc build-haddock-stamp
+build/haskell-$(CABAL_PACKAGE)-doc build/libghc-$(CABAL_PACKAGE)-doc:: dist-ghc/dist-ghc-stamp build-haddock-stamp
 
 dist-hugs: $(DEB_SETUP_BIN_NAME)
 	$(DEB_SETUP_BIN_NAME) configure --hugs --prefix=/usr -v2 --builddir=dist-hugs $(DEB_SETUP_HUGS_CONFIGURE_ARGS)
@@ -104,7 +105,7 @@
 build/libhugs-$(CABAL_PACKAGE):: dist-hugs
 	$(DEB_SETUP_BIN_NAME) build --builddir=dist-hugs
 
-debian/tmp-inst-ghc: $(DEB_SETUP_BIN_NAME) dist-ghc
+debian/tmp-inst-ghc: $(DEB_SETUP_BIN_NAME) dist-ghc/dist-ghc-stamp
 	$(DEB_SETUP_BIN_NAME) copy --builddir=dist-ghc --destdir=debian/tmp-inst-ghc
 
 install/libghc-$(CABAL_PACKAGE)-dev:: debian/tmp-inst-ghc