From 5b0f20d8cb31edc5d46afc915cb72bfcc4129218 Mon Sep 17 00:00:00 2001 From: Nikolai Kondrashov Date: Tue, 20 May 2014 17:52:43 +0300 Subject: build: Switch to AM_DISTCHECK_CONFIGURE_FLAGS MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Use AM_DISTCHECK_CONFIGURE_FLAGS in Makefile.am instead of DISTCHECK_CONFIGURE_FLAGS to allow using the latter at build time, upon making distcheck target. In particular, the above would allow specifying --with-test-dir option to help archive test data in CI runs, like this: make distcheck DISTCHECK_CONFIGURE_FLAGS=--with-test-dir=/dev/shm/ci-test-dir Reviewed-by: Lukáš Slebodník (cherry picked from commit 8d15291907aaa4d50bb66fdb7a5002fce7ac7bf4) Conflicts: Makefile.am --- Makefile.am | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile.am b/Makefile.am index 9fddf36c5..7f44a52c1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3,9 +3,9 @@ if HAVE_DEVSHM extra_distcheck_flags += --with-test-dir=/dev/shm endif -DISTCHECK_CONFIGURE_FLAGS = --with-ldb-lib-dir="$$dc_install_base"/lib/ldb \ - --enable-all-experimental-features \ - $(extra_distcheck_flags) +AM_DISTCHECK_CONFIGURE_FLAGS = --with-ldb-lib-dir="$$dc_install_base"/lib/ldb \ + --enable-all-experimental-features \ + $(extra_distcheck_flags) SUBDIRS = po -- cgit