aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2017-07-19 08:55:44 +0000
committerWerner Koch <[email protected]>2017-07-19 08:55:44 +0000
commit9937aa8fdad613b9bb7786cebb3b39e0186001e1 (patch)
tree030777e53f47762703358ddb58301ccd4d9bf219
parentindent: Fix indentation of an if block. (diff)
downloadgnupg-9937aa8fdad613b9bb7786cebb3b39e0186001e1.tar.gz
gnupg-9937aa8fdad613b9bb7786cebb3b39e0186001e1.zip
build: Avoid check gpg --version during make distcheck.
-- Signed-off-by: Werner Koch <[email protected]>
-rw-r--r--g10/Makefile.am9
1 files changed, 9 insertions, 0 deletions
diff --git a/g10/Makefile.am b/g10/Makefile.am
index 60e7e11e0..b5e4eded7 100644
--- a/g10/Makefile.am
+++ b/g10/Makefile.am
@@ -32,7 +32,16 @@ endif
needed_libs = ../cipher/libcipher.a ../mpi/libmpi.a ../util/libutil.a
other_libs = $(LIBICONV) $(DNSLIBS) $(LIBINTL) $(CAPLIBS)
+
bin_PROGRAMS = gpg gpgv
+
+# "make distcheck" runs "gpg --version" which unfortunately may print
+# warnings about unsupported options to stderr which make distcheck
+# rejects. I am not sure on how to pass the envvar GNUPGHOME to that
+# gpg invocation to make sure that a gpg.conf from gnupg 2 is not
+# used. The easiest way to avoid that is to not run this extra test.
+AM_INSTALLCHECK_STD_OPTIONS_EXEMPT = gpg$(EXEEXT)
+
dist_pkgdata_DATA = options.skel
if ENABLE_BZIP2_SUPPORT