[6699] get make distcheck to work

[Gavin D. Smith]

Revision: 6699
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=6699
Author:   gavin
Date:     2015-10-16 11:44:07 +0000 (Fri, 16 Oct 2015)
Log Message:
-----------
get make distcheck to work

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/configure.ac
    trunk/tp/Texinfo/Convert/XSParagraph/Makefile.am

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2015-10-16 10:09:45 UTC (rev 6698)
+++ trunk/ChangeLog     2015-10-16 11:44:07 UTC (rev 6699)
@@ -1,5 +1,16 @@
 2015-10-16  Gavin Smith  <address@hidden>
 
+       Get 'make distcheck' to work:
+
+       * tp/Texinfo/Convert/XSParagraph/Makefile.am: Remove XSParagraph.c
+       from BUILT_SOURCES, and add it to CLEANFILES.  Use $< instead of 
+       $*.xs in .xs.c rule.
+       * configure.ac: Configure in tp/TestXS and in
+       tp/Texinfo/Convert/XSParagraph unconditionally.  Update comment 
+       referring to ignored TeX tests.
+
+2015-10-16  Gavin Smith  <address@hidden>
+
        * tp/t/README: Mention running maintain/regenerate_file_lists.sh.
 
 2015-10-14  Gavin Smith  <address@hidden>

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac  2015-10-16 10:09:45 UTC (rev 6698)
+++ trunk/configure.ac  2015-10-16 11:44:07 UTC (rev 6699)
@@ -358,6 +358,9 @@
     [ enable_xs=$enableval],
     [ enable_xs=check])
 
+# Configure in TestXS directory unconditionally so that "make dist"
+# works.
+AC_CONFIG_SUBDIRS([tp/TestXS])
 if test $enable_xs = check; then
   AC_MSG_CHECKING([whether we can build Perl extension modules])
   enable_xs=no
@@ -365,26 +368,23 @@
     && ${PERL} -w fail.pl | grep 'message from XS module') >/dev/null \
   && enable_xs=yes
   AC_MSG_RESULT([$enable_xs])
-  # We can't use AC_CONFIG_SUBDIRS here because it isn't executed right
-  # away.  There is the problem of not passing on all the options we 
-  # were given to the subsidiary configure script.  If the check gets it
-  # wrong the user needs to give --enable-perl-xs or --disable-perl-xs
-  # themselves.
+  # There is a problem here of not passing on all the options we 
+  # were given to the subsidiary configure script.  This could lead the
+  # test to give the wrong answer, in which case the user would need to 
+  # give --enable-perl-xs or --disable-perl-xs themselves.
 fi
 
 AC_SUBST([enable_xs])
 
 AM_CONDITIONAL([DISABLE_XS], [test "z$enable_xs" = zno])
 
-if test $enable_xs = yes; then
-  AC_CONFIG_SUBDIRS([tp/Texinfo/Convert/XSParagraph])
-fi
+AC_CONFIG_SUBDIRS([tp/Texinfo/Convert/XSParagraph])
 
 
 # Tests.
 AC_CONFIG_FILES([install-info/tests/defs])
-dnl Except we cannot enable the TeX-related tests,
-dnl so don't waste time configuring them.  See util/tests/README.
+dnl We cannot enable the TeX-related tests, so don't waste time
+dnl configuring them.  See contrib/nontests/README.
 dnl AC_CONFIG_FILES([util/tests/defs])
 dnl AC_CHECK_PROGS([HEVEA], [hevea], [])
 dnl AC_CHECK_PROGS([TEX], [tex], [])

Modified: trunk/tp/Texinfo/Convert/XSParagraph/Makefile.am
===================================================================
--- trunk/tp/Texinfo/Convert/XSParagraph/Makefile.am    2015-10-16 10:09:45 UTC 
(rev 6698)
+++ trunk/tp/Texinfo/Convert/XSParagraph/Makefile.am    2015-10-16 11:44:07 UTC 
(rev 6699)
@@ -46,7 +46,7 @@
 XSUBPPARGS = -typemap $(PERL_CONF_privlibexp)/ExtUtils/typemap
 
 .xs.c:
-       $(XSUBPP) $(XSUBPPARGS) $*.xs > $*.xsc && mv $*.xsc $*.c
+       $(XSUBPP) $(XSUBPPARGS) $< > $*.xsc && mv $*.xsc $*.c
 
 # -------------------------------------------------------
 
@@ -54,7 +54,7 @@
 XSParagraph_la_SOURCES = XSParagraph.c xspara.c xspara.h \
                         text.c text.h ppport.h
 
-BUILT_SOURCES = XSParagraph.c
+CLEANFILES = XSParagraph.c
 EXTRA_DIST += XSParagraph.xs
 
 # Override these variables set by configure at the top level, because