--- haxml/Makefile~	2008-06-01 15:28:11.000000000 +0000
+++ haxml/Makefile	2008-06-01 15:39:32.000000000 +0000
@@ -67,13 +67,8 @@
 	cd obj/nhc98; $(MAKE) HC=nhc98 install-filesonly-nhc98
 install-filesonly-hugs: install-hugs
 haddock:
-	#do cpp -P -traditional -D__NHC__ $$file >$$file.uncpp;
-	for file in $(SRCS); \
-		do cpphs --noline -D__NHC__ $$file >$$file.uncpp; \
-		done
 	-mkdir docs/HaXml
-	haddock -h -t HaXml -o docs/HaXml $(patsubst %, %.uncpp, $(SRCS))
-	rm $(patsubst %, %.uncpp, $(SRCS))
+	haddock --optghc=-cpp -h -t HaXml -o docs/HaXml $(SRCS)
 
 # packaging a distribution