pivot table procedure conceptually works

[pspp] / doc / automake.mk

diff --git a/doc/automake.mk b/doc/automake.mk
index 54af89a6ffc051248294aebb97f8f1d88990ee87..a5255e03fe2ddc2ba27bd8f985b2d8eef1bd2b70 100644 (file)
--- a/doc/automake.mk
+++ b/doc/automake.mk
@@ -38,26 +38,29 @@ 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.texi $(doc_pspp_TEXINFOS)
        @$(MKDIR_P)  doc
-       $(MAKEINFO) $(AM_MAKEINFOFLAGS) --docbook -I $(top_srcdir) \
+       $(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' \
@@ -75,7 +78,7 @@ $(srcdir)/doc/pspp.xml: doc/pspp.texi $(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