diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | Makefile.in | 4 |
3 files changed, 10 insertions, 4 deletions
@@ -1,5 +1,11 @@ 2018-12-03 Ben Elliston <bje@gnu.org> + * Makefile.am (EXTRA_DIST): Use $(TEXINFO_TEX), not a hardcoded + doc/texinfo.tex. With thanks to Jacob Bachmeyer. + * Makefile.in: Regenerate. + +2018-12-03 Ben Elliston <bje@gnu.org> + * Makefile.am (TEXINFO_TEX): Set to doc/texinfo.tex. (EXTRA_DIST): Add doc/texinfo.tex. Setting TEXINFO_TEX otherwise prevents the distribution of the overridden texinfo.tex. diff --git a/Makefile.am b/Makefile.am index 23f5e42..9147321 100644 --- a/Makefile.am +++ b/Makefile.am @@ -21,9 +21,9 @@ AUTOMAKE_OPTIONS = dejagnu export DEJAGNU -EXTRA_DIST = ChangeLog-1992 MAINTAINERS doc/texinfo.tex runtest \ +EXTRA_DIST = ChangeLog-1992 MAINTAINERS runtest \ $(pkgdata_DATA) $(config_DATA) $(baseboard_DATA) \ - $(TESTSUITE_FILES) $(XML) $(CONTRIB) + $(TESTSUITE_FILES) $(XML) $(CONTRIB) $(TEXINFO_TEX) DISTCLEANFILES = xXx.log xXx.sum x.log x.sum testrun.log \ testrun.sum testrun.xml diff --git a/Makefile.in b/Makefile.in index 901afc2..63a5872 100644 --- a/Makefile.in +++ b/Makefile.in @@ -373,9 +373,9 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = dejagnu -EXTRA_DIST = ChangeLog-1992 MAINTAINERS doc/texinfo.tex runtest \ +EXTRA_DIST = ChangeLog-1992 MAINTAINERS runtest \ $(pkgdata_DATA) $(config_DATA) $(baseboard_DATA) \ - $(TESTSUITE_FILES) $(XML) $(CONTRIB) + $(TESTSUITE_FILES) $(XML) $(CONTRIB) $(TEXINFO_TEX) DISTCLEANFILES = xXx.log xXx.sum x.log x.sum testrun.log \ testrun.sum testrun.xml |