about summary refs log tree commit diff
diff options
context:
space:
mode:
authorEelco Dolstra <e.dolstra@tudelft.nl>2005-09-15T15·21+0000
committerEelco Dolstra <e.dolstra@tudelft.nl>2005-09-15T15·21+0000
commitd1d027199672f514253cbd7ddef1903fdf2c3710 (patch)
tree552cecb62de843ed740fb58cdcb4a84367f8e993
parent7f384d9c1b4699af2e2ea71c644d6e9bd72be581 (diff)
* Check for w3m.
-rw-r--r--Makefile.am7
-rw-r--r--configure.ac1
-rw-r--r--doc/manual/Makefile.am5
3 files changed, 10 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am
index ccc5bf273c2a..aee2d999816d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 SUBDIRS = externals src scripts corepkgs doc misc tests
 EXTRA_DIST = substitute.mk nix.spec nix.spec.in bootstrap.sh \
-  svn-revision nix.conf.example
+  svn-revision nix.conf.example NEWS
 
 include ./substitute.mk
 
@@ -45,3 +45,8 @@ endif
 
 svn-revision:
 	svnversion . > svn-revision
+
+all-local: NEWS
+
+NEWS:
+	cp doc/manual/NEWS.txt NEWS
diff --git a/configure.ac b/configure.ac
index 79b4830616ed..32165395614e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -82,6 +82,7 @@ NEED_PROG(bunzip2, bunzip2)
 NEED_PROG(shell, sh)
 AC_PATH_PROG(xmllint, xmllint, false)
 AC_PATH_PROG(xsltproc, xsltproc, false)
+AC_PATH_PROG(w3m, w3m, false)
 AC_PATH_PROG(flex, flex, false)
 AC_PATH_PROG(bison, bison, false)
 NEED_PROG(perl, perl)
diff --git a/doc/manual/Makefile.am b/doc/manual/Makefile.am
index 2cc3766120f6..c85c79d9d55e 100644
--- a/doc/manual/Makefile.am
+++ b/doc/manual/Makefile.am
@@ -51,7 +51,8 @@ NEWS.txt: release-notes.xml
 	$(XSLTPROC) --nonet --xinclude quote-literals.xsl release-notes.xml | \
 	  $(XSLTPROC) --nonet --output $@.tmp.html $(NEWS_OPTS) \
 	  $(docbookxsl)/html/docbook.xsl -
-	w3m -dump $@.tmp.html > $@
+	$(w3m) -dump $@.tmp.html > $@
+	rm $@.tmp.html
 
 
 all-local: manual.html NEWS.html NEWS.txt
@@ -71,7 +72,7 @@ images:
 	cp $(docbookxsl)/images/callouts/*.png images/callouts
 	chmod +w -R images
 
-KEEP = manual.html manual.is-valid version.txt $(MANS)
+KEEP = manual.html manual.is-valid version.txt $(MANS) NEWS.html NEWS.txt
 
 EXTRA_DIST = $(MANUAL_SRCS) $(FIGURES) $(KEEP)