diff options
| author | Werner Koch <[email protected]> | 2017-03-01 17:40:05 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2017-03-01 17:40:05 +0000 |
| commit | 246b27921b5dc34f367d879402725784aaee2494 (patch) | |
| tree | fca8ace2d5cb8ff21ccf7e7cc15809d09d3ad18f /Makefile.am | |
| parent | po: Auto-update (diff) | |
| download | gnupg-246b27921b5dc34f367d879402725784aaee2494.tar.gz gnupg-246b27921b5dc34f367d879402725784aaee2494.zip | |
build: Add kludge for "make distcheck" in a release build.
* configure.ac: New option --enable-gnupg-builddir-envvar.
(ENABLE_GNUPG_BUILDDIR_ENVVAR): New ac_define.
* common/homedir.c (gnupg_set_builddir_from_env): Consider
ENABLE_GNUPG_BUILDDIR_ENVVAR.
* Makefile.am (DISTCHECK_CONFIGURE_FLAGS): Rename to ...
(AM_DISTCHECK_CONFIGURE_FLAGS): this to be future proof. Add option
--enable-gnupg-builddir-envvar.
--
Our regression test suite makes use of the envvar GNUPG_BUILDDIR. Now
the code in gnupg for evaluating this envvar is only included in a
development version (that is one with a "-betaNNN" suffix). For a
real release the envvar is not considered. However during a "make
distcheck" a "make check" is done for the build directory. Without
defining that envar we would try to run binaries in the install
directory ("_inst" sub-directory) which are not yet installed at that
time.
Signed-off-by: Werner Koch <[email protected]>
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index e220f8b87..71e691afd 100644 --- a/Makefile.am +++ b/Makefile.am @@ -19,7 +19,8 @@ ## Process this file with automake to produce Makefile.in ACLOCAL_AMFLAGS = -I m4 -DISTCHECK_CONFIGURE_FLAGS = --enable-symcryptrun --enable-g13 \ +AM_DISTCHECK_CONFIGURE_FLAGS = --enable-gnupg-builddir-envvar \ + --enable-symcryptrun --enable-g13 \ --enable-gpg2-is-gpg --enable-gpgtar --enable-wks-tools --disable-ntbtls GITLOG_TO_CHANGELOG=gitlog-to-changelog |