X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=doc%2Fautomake.mk;h=a5255e03fe2ddc2ba27bd8f985b2d8eef1bd2b70;hb=refs%2Fheads%2Fpivot-table2;hp=6e14132f0c8b41372887f41d9a1f4a8a8b108590;hpb=8d6ff8a6bd25b184474a117c8332275b5add2d2b;p=pspp

diff --git a/doc/automake.mk b/doc/automake.mk
index 6e14132f0c..a5255e03fe 100644
--- a/doc/automake.mk
+++ b/doc/automake.mk
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in  -*- makefile -*-
 
-info_TEXINFOS = doc/pspp.texinfo doc/pspp-dev.texinfo
+info_TEXINFOS = doc/pspp.texi doc/pspp-dev.texi
 
 doc_pspp_TEXINFOS = doc/version.texi \
 	doc/bugs.texi \
@@ -38,27 +38,30 @@ doc_pspp_dev_TEXINFOS = doc/version-dev.texi \
 	doc/dev/i18n.texi \
 	doc/dev/output.texi \
 	doc/dev/system-file-format.texi \
+	doc/dev/pc+-file-format.texi \
 	doc/dev/portable-file-format.texi \
 	doc/dev/q2c.texi
 
-EXTRA_DIST += doc/pspp.man \
-	doc/get-commands.pl
+dist_man_MANS += doc/pspp.1 \
+                 doc/psppire.1
+
+EXTRA_DIST += doc/get-commands.pl
 
 $(srcdir)/doc/ni.texi: $(top_srcdir)/src/language/command.def doc/get-commands.pl
 	@$(MKDIR_P)  doc
-	$(PERL) $(top_srcdir)/doc/get-commands.pl $(top_srcdir)/src/language/command.def > $@
+	$(AM_V_GEN)$(PERL) $(top_srcdir)/doc/get-commands.pl $(top_srcdir)/src/language/command.def > $@
 
 $(srcdir)/doc/tut.texi:
 	@$(MKDIR_P) doc
-	echo "@set example-dir $(examplesdir)" > $@
+	$(AM_V_GEN)echo "@set example-dir $(examplesdir)" > $@
 
 
 # The SED and AWK filters in this rule, are to work-around some nasty bugs in makeinfo version 4.13, which produces
 # broken docbook xml.  These workarounds are rather horrible and must be removed asap.
-$(srcdir)/doc/pspp.xml: doc/pspp.texinfo $(doc_pspp_TEXINFOS)
+$(srcdir)/doc/pspp.xml: doc/pspp.texi $(doc_pspp_TEXINFOS)
 	@$(MKDIR_P)  doc
-	$(MAKEINFO) $(AM_MAKEINFOFLAGS) --docbook -I $(top_srcdir) \
-		$(top_srcdir)/doc/pspp.texinfo -o - \
+	$(AM_V_GEN)$(MAKEINFO) $(AM_MAKEINFOFLAGS) --docbook -I $(top_srcdir) \
+		$(top_srcdir)/doc/pspp.texi -o - \
 		| $(SED) -e 's/Time-&-Date/Time-\&-Date/g' \
 		-e 's/“/\“/g' \
 		-e 's/”/\”/g' \
@@ -75,7 +78,7 @@ $(srcdir)/doc/pspp.xml: doc/pspp.texinfo $(doc_pspp_TEXINFOS)
 		-e 's%\(<figure [^>]*\)>%\1/>%g' \
 	 | $(AWK) '/<para>.*<table.*>.*<\/para>/{x=sub("</para>",""); print; s=1;next}/<\/table>/{print; if (s==1) print "</para>"; s=0; next}1' \
 	> $@
-	$(XMLLINT) --output /dev/null $@ || ( $(RM) $@ ; false)
+	$(AM_V_at)$(XMLLINT) --output /dev/null $@ || ( $(RM) $@ ; false)
 
 docbookdir = $(docdir)
 dist_docbook_DATA = doc/pspp.xml