diff options
Diffstat (limited to 'lib/am/distdir.am')
| -rw-r--r-- | lib/am/distdir.am | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/lib/am/distdir.am b/lib/am/distdir.am index f3549876e..a8ad63cef 100644 --- a/lib/am/distdir.am +++ b/lib/am/distdir.am @@ -452,13 +452,16 @@ distcheck: dist ## so be sure to 'cd' back to the original directory after this. && am__cwd=`pwd` \ && $(am__cd) $(distdir)/_build \ - && ../configure --srcdir=.. --prefix="$$dc_install_base" \ + && ../configure \ ?GETTEXT? --with-included-gettext \ -## Additional flags for configure. Keep this last in the configure -## invocation so the developer and user can override previous options, -## and let the user's flags take precedence over the developer's ones. +## Additional flags for configure. $(AM_DISTCHECK_CONFIGURE_FLAGS) \ $(DISTCHECK_CONFIGURE_FLAGS) \ +## At the moment, the code doesn't actually support changes in these --srcdir +## and --prefix values, so don't allow them to be overridden by the user or +## the developer. That used to be allowed, and caused issues in practice +## (in corner-case usages); see automake bug#14991. + --srcdir=.. --prefix="$$dc_install_base" \ && $(MAKE) $(AM_MAKEFLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) dvi \ && $(MAKE) $(AM_MAKEFLAGS) check \ |