diff options
| author | Ben Elliston <bje@gnu.org> | 2018-12-03 17:15:23 +1100 |
|---|---|---|
| committer | Ben Elliston <bje@gnu.org> | 2018-12-03 17:15:23 +1100 |
| commit | 39f49df96ab6eaa8106f5a5675ccf4fb05f8c158 (patch) | |
| tree | 6b1ef3612ffa20e262e4b6e25ccb06bbab3234c3 | |
| parent | dc3f6035520ecf78338def2b0b07139a64b2b219 (diff) | |
| download | dejagnu-39f49df96ab6eaa8106f5a5675ccf4fb05f8c158.zip dejagnu-39f49df96ab6eaa8106f5a5675ccf4fb05f8c158.tar.gz dejagnu-39f49df96ab6eaa8106f5a5675ccf4fb05f8c158.tar.bz2 | |
* 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.
* Makefile.in: Regenerate.
* texinfo.tex: Move from here ..
* doc/texinfo.tex: .. to here.
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | Makefile.am | 3 | ||||
| -rw-r--r-- | Makefile.in | 8 | ||||
| -rw-r--r-- | doc/texinfo.tex (renamed from texinfo.tex) | 0 |
4 files changed, 15 insertions, 5 deletions
@@ -1,5 +1,14 @@ 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. + * Makefile.in: Regenerate. + * texinfo.tex: Move from here .. + * doc/texinfo.tex: .. to here. + +2018-12-03 Ben Elliston <bje@gnu.org> + * lib/framework.exp (isremote): Add verbose message. 2018-12-02 Ben Elliston <bje@gnu.org> diff --git a/Makefile.am b/Makefile.am index cd69e74..23f5e42 100644 --- a/Makefile.am +++ b/Makefile.am @@ -21,7 +21,7 @@ AUTOMAKE_OPTIONS = dejagnu export DEJAGNU -EXTRA_DIST = ChangeLog-1992 MAINTAINERS runtest \ +EXTRA_DIST = ChangeLog-1992 MAINTAINERS doc/texinfo.tex runtest \ $(pkgdata_DATA) $(config_DATA) $(baseboard_DATA) \ $(TESTSUITE_FILES) $(XML) $(CONTRIB) @@ -176,5 +176,6 @@ unit_SOURCES = testsuite/libdejagnu/unit.cc # Documentation. +TEXINFO_TEX = doc/texinfo.tex dist_man_MANS = doc/runtest.1 info_TEXINFOS = doc/dejagnu.texi diff --git a/Makefile.in b/Makefile.in index 9ac3256..901afc2 100644 --- a/Makefile.in +++ b/Makefile.in @@ -218,7 +218,7 @@ am__v_texidevnull_ = $(am__v_texidevnull_@AM_DEFAULT_V@) am__v_texidevnull_0 = > /dev/null am__v_texidevnull_1 = INFO_DEPS = $(srcdir)/doc/dejagnu.info -am__TEXINFO_TEX_DIR = $(srcdir) +am__TEXINFO_TEX_DIR = $(srcdir)/doc DVIS = doc/dejagnu.dvi PDFS = doc/dejagnu.pdf PSS = doc/dejagnu.ps @@ -262,8 +262,7 @@ CSCOPE = cscope AM_RECURSIVE_TARGETS = cscope am__DIST_COMMON = $(dist_man_MANS) $(srcdir)/Makefile.in AUTHORS \ COPYING ChangeLog INSTALL NEWS README TODO compile \ - config.guess config.sub depcomp install-sh mdate-sh missing \ - texinfo.tex + config.guess config.sub depcomp install-sh mdate-sh missing DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) @@ -374,7 +373,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = dejagnu -EXTRA_DIST = ChangeLog-1992 MAINTAINERS runtest \ +EXTRA_DIST = ChangeLog-1992 MAINTAINERS doc/texinfo.tex runtest \ $(pkgdata_DATA) $(config_DATA) $(baseboard_DATA) \ $(TESTSUITE_FILES) $(XML) $(CONTRIB) @@ -519,6 +518,7 @@ AM_CXXFLAGS = -I$(top_srcdir) -g unit_SOURCES = testsuite/libdejagnu/unit.cc # Documentation. +TEXINFO_TEX = doc/texinfo.tex dist_man_MANS = doc/runtest.1 info_TEXINFOS = doc/dejagnu.texi all: all-am diff --git a/texinfo.tex b/doc/texinfo.tex index 5840aff..5840aff 100644 --- a/texinfo.tex +++ b/doc/texinfo.tex |