[fixes for distribution.
John Meacham <john@repetae.net>**20120208015220
 Ignore-this: 5844114c6728be83bd526d50333d0204
] hunk ./Makefile.am 64
-             lib/jhc lib/base lib/haskell98 lib/flat-foreign $(JHC_LIBS) $(JHC_EXT_LIBS) \
+             lib/jhc lib/jhc-prim lib/base lib/haskell98 lib/flat-foreign $(JHC_LIBS) $(JHC_EXT_LIBS) \
hunk ./Makefile.am 68
-	     src/FlagOpts.flags src/FlagDump.flags lib/ext
+	     examples/Primes.hs src/FlagOpts.flags src/FlagDump.flags lib/ext
+
+dist-hook: $(BUILT_SOURCES)
+	if test -f _darcs; then \
+		rm -f $(srcdir)/ChangeLog $(srcdir)/src/data/shortchange.txt; \
+		$(MAKE) ChangeLog src/data/shortchange.txt src/RawFiles.hs;   \
+		cp -f $(srcdir)/ChangeLog $(destdir)/ChangeLog; \
+		cp -f $(srcdir)/src/data/shortchange.txt $(destdir)/src/data/shortchange.txt; \
+		cp -f $(srcdir)/src/RawFiles.hs $(destdir)/src/RawFiles.hs; \
+	fi
hunk ./Makefile.am 80
-dist-hook: man manual
-	cp $(srcdir)/manual.html $(distdir)/manual.html
-	cp $(srcdir)/jhc.1 $(distdir)/jhc.1
-	find $(distdir) \( -name _darcs -o -name \*.ho \) -print | xargs rm -rf --
+#dist-hook: man manual $(BUILT_SOURCES)
+#	cp $(srcdir)/manual.html $(distdir)/manual.html
+#	cp $(srcdir)/jhc.1 $(distdir)/jhc.1
+
+       #find $(distdir) \( -name _darcs -o -name \*.ho \) -print | xargs rm -rf --
hunk ./Makefile.am 112
-RAWFILES = src/data/ViaGhc.hs ChangeLog src/data/shortchange.txt src/data/prelude.m4 \
+RAWFILES = src/data/ViaGhc.hs src/data/prelude.m4 \
hunk ./Makefile.am 114
-           rts/wsize.h rts/bitarray.h
+           rts/wsize.h rts/bitarray.h ChangeLog src/data/shortchange.txt 
hunk ./Makefile.am 157
-%.hs: %.flags  utils/opt_sets.prl
+%.hs: %.flags utils/opt_sets.prl
hunk ./Makefile.am 160
-%.mkd: %.flags  utils/opt_sets.prl
+%.mkd: %.flags utils/opt_sets.prl
hunk ./Makefile.am 169
-src/RawFiles.hs: utils/op_raw.prl $(RAWFILES)
-	perl $< $(basename $@) $(RAWFILES) > $@
+src/RawFiles.hs: $(RAWFILES)
+	perl $(srcdir)/utils/op_raw.prl $(basename $@) $^ > $@
hunk ./Makefile.am 172
-src/RtsFiles.hs: utils/op_raw.prl $(RTSFILES)
-	perl $< -c $(basename $@) $(RTSFILES) > $@
+src/RtsFiles.hs: $(RTSFILES)
+	perl $(srcdir)/utils/op_raw.prl -c $(basename $@) $^ > $@
hunk ./Makefile.am 180
-ChangeLog: _darcs/hashed_inventory
+ChangeLog:
hunk ./Makefile.am 197
-.INTERMEDIATE: deps.txt jhc_man.mkd  options.mkd
+.INTERMEDIATE: deps.txt jhc_man.mkd options.mkd
hunk ./Makefile.am 230
-CLEANFILES= $(JHC_LIBS) $(JHC_EXT_LIBS)
+CLEANFILES= $(JHC_LIBS) $(JHC_EXT_LIBS) HelloWorld Primes src/StringTable/Atom.hs src/RawFiles.hs
hunk ./Makefile.am 267
-manual.mkd: utils/stitch.prl $(JHC_MANUAL_FILES)
-	perl utils/stitch.prl $(JHC_MANUAL_FILES) > $@
+manual.mkd: $(JHC_MANUAL_FILES)
+	perl $(srcdir)/utils/stitch.prl $^ > $@
hunk ./Makefile.am 273
-jhc_man.mkd: utils/stitch.prl docs/man_header.mkd $(JHC_MANUAL_FILES)
-	perl utils/stitch.prl -h docs/man_header.mkd -c Using,Options $(JHC_MANUAL_FILES) > jhc_man.mkd
+$(firstword $(JHC_MANUAL_FILES)): utils/stitch.prl docs/man_header.mkd
+	touch $@
+
+jhc_man.mkd: $(JHC_MANUAL_FILES)
+	perl $(srcdir)/utils/stitch.prl -h $(srcdir)/docs/man_header.mkd -c Using,Options $^ > $@
+
hunk ./Makefile.am 281
-	pandoc jhc_man.mkd -s -f markdown -t man -s  -o jhc.1
+	pandoc $< -s -f markdown -t man -s  -o jhc.1
hunk ./Makefile.am 283
-options.mkd: jhc
+options.mkd: src/Options.hs | jhc
hunk ./Makefile.am 288
-#	#find src -not \( -name .svn -prune -o -name .git -prune \) -type f -print0 | xargs -0 sed -i  -E 's/[[:space:]]*$$//'
-#	#find lib -not \( -name .svn -prune -o -name .git -prune \) -type f -print0 | xargs -0 sed -i  -E 's/[[:space:]]*$$//'
hunk ./Makefile.am 303
-%: examples/%.hs jhc
-	./jhc -L- -L. $(JHC_TEST) $< -o $@ 2>&1 | tee $@.log
+%: examples/%.hs jhc base-1.0.hl haskell98-1.0.hl
+	./jhc -L- -L$(srcdir) -L. --no-cache $(JHC_TEST) $< -o $@ # 2>&1 | tee $@.log
+
+TESTS=HelloWorld Primes
hunk ./Makefile.am 382
-JHC_MANUAL_FILES = options.mkd docs/make.mkd docs/dependency_format.mkd docs/pragmas.mkd docs/differences.mkd \
+JHC_MANUAL_FILES = docs/make.mkd options.mkd docs/dependency_format.mkd docs/pragmas.mkd docs/differences.mkd \
hunk ./docs/manual.css 1
+/*
+ * Copyright (c) 2001, 2003 The FreeBSD Documentation Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * $FreeBSD: doc/share/misc/docbook.css,v 1.14 2008/11/21 07:28:34 keramida Exp $
+ */
hunk ./docs/manual.css 29
-th { border-bottom: black 1px solid; }
-img {
-    border: #777777 1px solid;
-    padding: 0.5em;
-    margin-left: 1em;
-    margin-right: 2em;
-    background-color: #e6e6e6;
-    color: black;
+BODY ADDRESS {
+	line-height: 1.3;
+	margin: .6em 0;
hunk ./docs/manual.css 34
+BODY BLOCKQUOTE {
+	margin-top: .75em;
+	line-height: 1.5;
+	margin-bottom: .75em;
+}
+
+HTML BODY {
+	margin: 1em 8% 1em 10%;
+	line-height: 1.2;
+	width: 750px;
+	text-align: justify;
+	font-size: 12px;
+}
+
+.LEGALNOTICE {
+	font-size: small;
+	font-variant: small-caps;
+}
+
+BODY DIV {
+	margin: 0;
+}
+
+DL {
+	margin: .8em 0;
+	line-height: 1.2;
+}
+
+BODY FORM {
+	margin: .6em 0;
+}
+
+H1, H2, H4, H5, H6,
+DIV.EXAMPLE P B,
+.QUESTION,
+DIV.TABLE P B,
+DIV.PROCEDURE P B {
+	color: #005599;
+}
+
+H1{
+    border-bottom: 1px solid black;
+}
+
+BODY H1, BODY H2, BODY H3, BODY H4, BODY H5, BODY H6 {
+	line-height: 1.3;
+	margin-left: 0;
+}
+
+BODY H1, BODY H2 {
+	margin: .8em 0 0 -4%;
+}
+
+BODY H3, BODY H4 {
+	margin: .8em 0 0 0%;
+	font-size: 1em;
+}
+
+BODY H5 {
+	margin: .8em 0 0 -2%;
+}
hunk ./docs/manual.css 96
+BODY H6 {
+	margin: .8em 0 0 -1%;
+}
+
+BODY HR {
+	margin: .6em;
+	border-width: 0 0 1px 0;
+	border-style: solid;
+	border-color: #cecece;
+}
+
+BODY IMG.NAVHEADER {
+	margin: 0 0 0 -4%;
+}
+
+OL {
+	margin: 0 0 0 5%;
+	line-height: 1.2;
+}
+
+BODY PRE {
+	margin: .75em 0;
+	line-height: 1.0;
+	font-family: monospace;
+}
hunk ./docs/manual.css 122
-body {
-    background:#fff;
-    padding:2% 5%;
-    margin:0;
+BODY TD, BODY TH {
+	line-height: 1.2;
hunk ./docs/manual.css 126
-a {
-    text-decoration:none;
-    font-weight:bold;
-    color:#c00;
+UL, BODY DIR, BODY MENU {
+	margin: 0 0 0 5%;
+	line-height: 1.2;
hunk ./docs/manual.css 131
-a:visited { color:#c55; }
+HTML {
+	margin: 0;
+	padding: 0;
+}
hunk ./docs/manual.css 136
-a:hover {
-    background:#000000;
-    color:#FFFFFF;
+BODY P B.APPLICATION {
+	color: #000000;
hunk ./docs/manual.css 140
-div#toc {
-    border: #777777 1px solid;
-    padding: 0.5em;
-    margin-left: 1em;
-    margin-right: 2em;
+.FILENAME {
+	color: #007a00;
+}
hunk ./docs/manual.css 144
+.GUIMENU, .GUIMENUITEM, .GUISUBMENU,
+.GUILABEL, .INTERFACE,
+.SHORTCUT, .SHORTCUT .KEYCAP {
+	font-weight: bold;
hunk ./docs/manual.css 150
-h1, h2, h3, h4, h1 a, h2 a, h3 a, h4 a { color:#666; }
-h1, h2, h3, h4 { font-size:medium; margin:4ex 0 1ex 0; padding:0; }
-h1, h2 { border-bottom: 2px solid #000; }
-h3 { border-bottom: 1px dashed #000; }
-h1 { font-size:large; border-bottom: 3px solid #000; margin:4ex 0 1ex 0; padding:0;}
+.GUIBUTTON {
+	background-color: #CFCFCF;
+	padding: 2px;
+}
hunk ./docs/manual.css 155
-div.header h1 {
-    font-size:xx-large; margin-top:1ex;
-    border-bottom: 5px solid #000;
+.ACCEL {
+	background-color: #F0F0F0;
+	text-decoration: underline;
hunk ./docs/manual.css 160
-hr {
-    border:none;
-    color:black;
-    background-color:#000;
-    height:2px;
-    margin-top:2ex;
+.SCREEN {
+	padding: 1ex;
hunk ./docs/manual.css 164
-pre {
-    border: #777777 1px solid;
-    padding: 0.5em;
-    margin-left: 1em;
-    margin-right: 2em;
-    white-space: pre;
-    background-color: #e6e6e6;
-    color: black;
+.PROGRAMLISTING {
+	padding: 1ex;
+	background-color: #eee;
+	border: 1px solid #ccc;
hunk ./docs/manual.css 170
+@media screen {  /* hide from IE3 */
+	a[href]:hover { background: #ffa }
+}
+
+BLOCKQUOTE.NOTE {
+	color: #222;
+	background: #eee;
+	border: 1px solid #ccc;
+	padding: 0.4em 0.4em;
+	width: 85%;
+}
+
+BLOCKQUOTE.TIP {
+	color: #004F00;
+	background: #d8ecd6;
+	border: 1px solid green;
+	padding: 0.2em 2em;
+	width: 85%;
+}
+
+BLOCKQUOTE.IMPORTANT {
+	font-style:italic;
+	border: 1px solid #a00;
+	border-left: 12px solid #c00;
+	padding: 0.1em 1em;
+}
+
+BLOCKQUOTE.WARNING {
+	color: #9F1313;
+	background: #f8e8e8;
+	border: 1px solid #e59595;
+	padding: 0.2em 2em;
+	width: 85%;
+}
+
+.EXAMPLE {
+	background: #fefde6;
+	border: 1px solid #f1bb16;
+	margin: 1em 0;
+	padding: 0.2em 2em;
+	width: 90%;
+}
hunk ./utils/op_raw.prl 7
-
hunk ./utils/op_raw.prl 58
-    open F, "<:utf8", $fn;
+    open F, "<:utf8", $fn or die "$!: $fn";
hunk ./utils/op_raw.prl 61
-    print "-- | Generated from $fn on " . `date`;
+    print "-- | Generated from $fn\n";
hunk ./utils/op_raw.prl 65
+    close F or die "$!: close $fn";
+