Mercurial > urweb

changeset 1910:0337d8aed94b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Get SML/NJ support working again
author Adam Chlipala <adam@chlipala.net>
date Fri, 22 Nov 2013 09:48:16 -0500
parents 659d1f4e95bf
children 7d26b96370af
files Makefile.am
diffstat 1 files changed, 2 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile.am	Fri Nov 22 09:36:14 2013 -0500
+++ b/Makefile.am	Fri Nov 22 09:48:16 2013 -0500
@@ -26,7 +26,7 @@
 	rm -rf .cm src/.cm
 
 src/urweb.cm: src/prefix.cm src/sources
-	cat $^ > $@
+	cat $^ | sed -e 's/$$(SRC)\///g' > $@
 
 src/urweb.mlb: src/prefix.mlb src/sources src/suffix.mlb
 	sed -e 's/^\(.*\).grm$$/$$(BUILD)\/\1.mlton.grm.sig:\1.mlton.grm.sml/' -e 'y/:/\n/' \
@@ -110,10 +110,7 @@
 	hg archive -t tgz -X tests "/tmp/urweb-$(VERSION).tgz"
 
 reauto:
-	-autoreconf
-	libtoolize -cf
-	automake --add-missing --force-missing --copy
-	autoreconf
+	./autogen.sh
 
 EXTRA_DIST = demo doc lib/js lib/ur xml \
 	src/coq src/*.sig src/*.sml src/*.mlb src/config.sml.in src/elisp src/*.cm src/sources src/*.grm src/*.lex \