Means Dialog: Replace deprecated widgets

[pspp] / doc / automake.mk

diff --git a/doc/automake.mk b/doc/automake.mk
index 2c6ec860e1266914e74220147987f4e570d280c3..4e1b3ff349595cac520255b711f55b8010a0f5f0 100644 (file)
--- a/doc/automake.mk
+++ b/doc/automake.mk
@@ -41,12 +41,13 @@ doc_pspp_dev_TEXINFOS = doc/version-dev.texi \
        doc/dev/system-file-format.texi \
        doc/dev/pc+-file-format.texi \
        doc/dev/portable-file-format.texi \
+       doc/dev/encrypted-file-wrappers.texi \
        doc/dev/q2c.texi
 
 dist_man_MANS += doc/pspp.1 \
                  doc/psppire.1
 
-EXTRA_DIST += doc/get-commands.pl
+EXTRA_DIST += doc/get-commands.pl doc/help-pages-list
 
 $(srcdir)/doc/ni.texi: $(top_srcdir)/src/language/command.def doc/get-commands.pl
        @$(MKDIR_P)  doc
@@ -81,8 +82,8 @@ $(srcdir)/doc/pspp.xml: doc/pspp.texi $(doc_pspp_TEXINFOS) doc/help-pages-list
         | $(AWK) '/<para>.*<table.*>.*<\/para>/{x=sub("</para>",""); print; s=1;next}/<\/table>/{print; if (s==1) print "</para>"; s=0; next}1' \
        > $@,tmp
        $(AM_V_at)$(XMLLINT) --output /dev/null $@,tmp
-       cat doc/help-pages-list | while read node ; do \
-        $(AM_V_at)$(XMLLINT) --xpath "$$node" $@,tmp > /dev/null; \
+       $(AM_V_at)cat doc/help-pages-list | while read node ; do \
+        $(XMLLINT) --xpath "$$node" $@,tmp > /dev/null; \
         if test $$? -ne 0 ; then  echo "$$node does not appear in $@" ; exit 1; fi ; \
         done 
        mv $@,tmp $@