[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 dc5f768f8360d69c05f5af16e76fcbb1088b1032
Author: John Goerzen <jgoerzen at complete.org>
Date:   Fri Feb 4 04:00:48 2005 +0100

    checkpointing doc fixes
    
    Keywords:
    
    
    (jgoerzen at complete.org--projects/missingh--head--0.7--patch-199)

diff --git a/ChangeLog b/ChangeLog
index abe0860..5b72602 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,18 @@
 # arch-tag: automatic-ChangeLog--jgoerzen at complete.org--projects/missingh--head--0.7
 #
 
+2005-02-03 21:00:48 GMT	John Goerzen <jgoerzen at complete.org>	patch-199
+
+    Summary:
+      checkpointing doc fixes
+    Revision:
+      missingh--head--0.7--patch-199
+
+
+    modified files:
+     ChangeLog Makefile debian/docs doc/Makefile doc/Pesco.pdf
+
+
 2005-02-03 20:42:30 GMT	John Goerzen <jgoerzen at complete.org>	patch-198
 
     Summary:
diff --git a/Makefile b/Makefile
index fe71473..bf0d183 100644
--- a/Makefile
+++ b/Makefile
@@ -22,6 +22,8 @@ LHSSOURCES := $(wildcard MissingH/*/*.lhs) \
 	$(wildcard MissingH/*/*/*.lhs)
 O1 := $(SOURCES:.hs=.o) $(LHSSOURCES)
 OBJS := $(O1:.lhs=.o)
+LHSCONVSOURCES := $(patsubst %.lhs,doctmp/%.hs,$(LHSSOURCES))
+UNLIT ?= $(shell ghc --print-libdir)/unlit
 
 .PHONY: all
 all: setup
@@ -31,6 +33,13 @@ all: setup
 setup: Setup.lhs MissingH.cabal
 	ghc -package Cabal Setup.lhs -o setup
 
+doctmp/%.hs: %.lhs doctmp
+	mkdir -p `dirname $@`
+	$(UNLIT) $< $@
+
+doctmp:
+	mkdir doctmp
+
 #libmissingH.a: $(OBJS)
 #	-rm -f libmissingH.a
 #	ar q libmissingH.a $(OBJS)
@@ -43,18 +52,18 @@ setup: Setup.lhs MissingH.cabal
 #
 
 .PHONY: doc
-doc:
+doc: $(LHSCONVSOURCES)
 	-rm -rf html
 	mkdir html
 	haddock $(HADDOCKARGS) --package=MissingH \
 	   --dump-interface=html/MissingH.haddock \
-	   -t 'MissingH API Manual' -h -o html $(SOURCES) $(LHSSOURCES)
+	   -t 'MissingH API Manual' -h -o html $(SOURCES) $(LHSCONVSOURCES)
 
 clean:
 	-./setup clean
 	-rm -rf html `find . -name "*.o"` `find . -name "*.hi"` \
 		`find . -name "*~"` *.a setup dist testsrc/runtests \
-		local-pkg
+		local-pkg doctmp
 	-rm -rf testtmp/*
 	-cd doc && $(MAKE) clean
 
diff --git a/debian/docs b/debian/docs
index e845566..3a98b6c 100644
--- a/debian/docs
+++ b/debian/docs
@@ -1 +1,3 @@
 README
+doc/Pesco.pdf
+announcements
diff --git a/doc/Makefile b/doc/Makefile
index b095b08..c3a5f92 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -5,7 +5,7 @@ all: Pesco.pdf
 clean:
 	-rm -f Pesco.{aux,log,tex} *~
 
-Pesco.tex: ../libsrc/MissingH/Regex/Pesco.lhs
+Pesco.tex: ../MissingH/Regex/Pesco.lhs
 	lhs2TeX --poly $< > $@
 
 Pesco.pdf: Pesco.tex
diff --git a/doc/Pesco.pdf b/doc/Pesco.pdf
index 86ea14c..bc86413 100644
Binary files a/doc/Pesco.pdf and b/doc/Pesco.pdf differ

-- 
haskell-testpack