[resolve conflicts
John Meacham <john@repetae.net>**20080209060521] hunk ./Makefile.am 56
-EXTRA_DIST = data utils arch docs FrontEnd/HsParser.y $(BUILT_SOURCES)
+JHC_LIBS =  base-1.0.hl haskell98-1.0.hl
+
+EXTRA_DIST = data utils arch docs FrontEnd/HsParser.y $(BUILT_SOURCES) lib/base lib/haskell98 lib/haskell98.cabal $(JHC_LIBS)
+
+dist-hook:
+	find $(distdir)  -name _darcs -o -name \*.ho | xargs rm -rf --
hunk ./Makefile.am 171
-haskell98-1.0.hl: jhc lib/haskell98/haskell98.cabal base-1.0.hl
+haskell98-1.0.hl: lib/haskell98.cabal base-1.0.hl