diff options
| author | Werner Koch <wk@gnupg.org> | 2017-03-01 18:40:05 +0100 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2017-03-01 18:40:05 +0100 |
| commit | 246b27921b5dc34f367d879402725784aaee2494 (patch) | |
| tree | fca8ace2d5cb8ff21ccf7e7cc15809d09d3ad18f /common | |
| parent | po: Auto-update (diff) | |
| download | gnupg2-246b27921b5dc34f367d879402725784aaee2494.tar.xz gnupg2-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 <wk@gnupg.org>
Diffstat (limited to 'common')
| -rw-r--r-- | common/homedir.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/common/homedir.c b/common/homedir.c index 6b40bb6bf..3055a322e 100644 --- a/common/homedir.c +++ b/common/homedir.c @@ -914,7 +914,7 @@ gnupg_set_builddir (const char *newdir) static void gnupg_set_builddir_from_env (void) { -#ifdef IS_DEVELOPMENT_VERSION +#if defined(IS_DEVELOPMENT_VERSION) || defined(ENABLE_GNUPG_BUILDDIR_ENVVAR) if (gnupg_build_directory) return; |