--- ghc6-6.6.orig/mk/package.mk
+++ ghc6-6.6/mk/package.mk
@@ -387,17 +387,16 @@
        --package=$(PACKAGE) \
        --dump-interface=$(PACKAGE).haddock \
        --use-index=../doc-index.html --use-contents=../index.html \
-       --source-module=$(HaddockSourceURL) \
        $(foreach pkg, $(PACKAGE_DEPS), \
           --read-interface=../$(pkg),../$(pkg)/$(pkg).haddock)

 CLEAN_FILES += $(PACKAGE).haddock

 %.raw-hs : %.lhs
-   $(HC) $(HC_OPTS) -D__HADDOCK__ -E $< -o $@
+   $(HC) $(HC_OPTS) -D__HADDOCK__ -E -optP-P $< -o $@

 %.raw-hs : %.hs
-   $(HC) $(HC_OPTS) -D__HADDOCK__ -E $< -o $@
+   $(HC) $(HC_OPTS) -D__HADDOCK__ -E -optP-P $< -o $@

 HTML_INSTALL_DIR = $(datadir)/html/libraries/$(PACKAGE)
 #  NOT the same as HTML_DIR_INSTALLED when BIN_DIST is on