[Pkg-haskell-commits] [SCM] haskell-testpack branch, master, updated. debian/1.0.2-1-4-gb0d6b36

[John Goerzen]

The following commit has been merged in the master branch:
commit 97f69c2532dc4fb7c58a952e5be5203f41653d21
Author: John Goerzen <jgoerzen at complete.org>
Date:   Thu Dec 7 04:02:26 2006 +0100

    No longer use custom html location

diff --git a/Makefile b/Makefile
index d977cfb..65c2727 100644
--- a/Makefile
+++ b/Makefile
@@ -39,13 +39,12 @@ doctmp:
 
 .PHONY: doc
 doc: $(LHSCONVSOURCES) setup
-	-rm -rf html
+	-rm -rf dist/doc/html
 	./setup configure
 	./setup haddock
 #	haddock $(HADDOCKARGS) --package=$(PROJECT) \
 #	   --dump-interface=html/$(PROJECT).haddock \
 #	   -t '$(PROJECT) API Manual' -h -o html $(HUGSCONVSOURCES) $(LHSCONVSOURCES)
-	mv dist/doc/html .
 
 .PHONY: hugsbuild
 
diff --git a/debian/missingh-doc.docs b/debian/missingh-doc.docs
index cf7cb60..e000067 100644
--- a/debian/missingh-doc.docs
+++ b/debian/missingh-doc.docs
@@ -1 +1 @@
-html/*
+dist/doc/html/*
diff --git a/debian/rules b/debian/rules
index d0a1189..f6605d6 100644
--- a/debian/rules
+++ b/debian/rules
@@ -55,7 +55,7 @@ clean:
 	# Add here commands to clean up after the build process.
 	-./setup clean
 	-make clean
-	-rm -rf setup Setup.hi Setup.ho Setup.o .*config* dist html
+	-rm -rf setup Setup.hi Setup.ho Setup.o .*config* dist 
 
 	dh_clean 
 

-- 
haskell-testpack