diff options
| author | Karl Berry <karl@freefriends.org> | 2020-05-17 09:36:15 -0700 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2020-05-17 09:36:15 -0700 |
| commit | 04567be6e90beb62d07aaf981300a8d2e831fe90 (patch) | |
| tree | e51f809481b2dbdd0701404264b0573921c074fb /lib | |
| parent | afba8295f910f3b7e3f2c5d3edae0094b91d117a (diff) | |
| download | automake-04567be6e90beb62d07aaf981300a8d2e831fe90.tar.gz | |
automake: new variable AM_DISTCHECK_DVI_TARGET to override "dvi".
This change fixes https://bugs.gnu.org/8289.
* lib/am/distdir.am (AM_DISTCHECK_DVI_TARGET): define as dvi.
(distcheck): use it, isntead of hardcoding dvi.
* lib/Automake/Variable.pm (%_silent_variable_override): add
AM_DISTCHECK_DVI_TARGET.
* t/distcheck-override-dvi.sh: new test.
* t/list-of-tests.mk (handwritten_TESTS): add it.
* doc/automake.texi (Checking the Distribution): document this.
(Third-Party Makefiles): explicitly mention that
EMPTY_AUTOMAKE_TARGETS is not a built-in or special name.
Various other index entries and wording tweaks.
* NEWS (Distribution): mention this.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Automake/Variable.pm | 3 | ||||
| -rw-r--r-- | lib/am/distdir.am | 5 |
2 files changed, 6 insertions, 2 deletions
diff --git a/lib/Automake/Variable.pm b/lib/Automake/Variable.pm index 72872a3a9..363a3e0ed 100644 --- a/lib/Automake/Variable.pm +++ b/lib/Automake/Variable.pm @@ -198,7 +198,8 @@ my $configure_ac; # Variables that can be overridden without complaint from -Woverride my %_silent_variable_override = - (AM_MAKEINFOHTMLFLAGS => 1, + (AM_DISTCHECK_DVI_TARGET => 1, + AM_MAKEINFOHTMLFLAGS => 1, AR => 1, ARFLAGS => 1, DEJATOOL => 1, diff --git a/lib/am/distdir.am b/lib/am/distdir.am index 26212413a..774d08b91 100644 --- a/lib/am/distdir.am +++ b/lib/am/distdir.am @@ -425,6 +425,9 @@ if %?SUBDIRS% AM_RECURSIVE_TARGETS += distcheck endif %?SUBDIRS% +# Exists only to be overridden by the user if desired. +AM_DISTCHECK_DVI_TARGET = dvi + # This target untars the dist file and tries a VPATH configuration. Then # it guarantees that the distribution is self-contained by making another # tarfile. @@ -490,7 +493,7 @@ distcheck: dist ## (in corner-case usages); see automake bug#14991. --srcdir=../.. --prefix="$$dc_install_base" \ && $(MAKE) $(AM_MAKEFLAGS) \ - && $(MAKE) $(AM_MAKEFLAGS) dvi \ + && $(MAKE) $(AM_MAKEFLAGS) $(AM_DISTCHECK_DVI_TARGET) \ && $(MAKE) $(AM_MAKEFLAGS) check \ && $(MAKE) $(AM_MAKEFLAGS) install \ && $(MAKE) $(AM_MAKEFLAGS) installcheck \ |