diff options
| author | Oliver Smith <osmith@sysmocom.de> | 2018-12-04 15:24:54 +0100 |
|---|---|---|
| committer | Oliver Smith <osmith@sysmocom.de> | 2018-12-04 15:31:28 +0100 |
| commit | 61469d1d86b6a347823efecffa037997b1cd08da (patch) | |
| tree | 96985124361024093464e11f7fe67075f7482d35 | |
| parent | 47aab58ec3e1973558a6793bc48801d26a337357 (diff) | |
Fix DISTCHECK_CONFIGURE_FLAGS override
Set AM_DISTCHECK_CONFIGURE_FLAGS in Makefile.am instead of
DISTCHECK_CONFIGURE_FLAGS. This is the recommended way from the
automake manual, as otherwise the flag can't be changed by the user
anymore.
Related: OS#3718
Change-Id: I10d1eef9838c0b843a3a4103b7b03e8e9457b69e
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rwxr-xr-x | contrib/jenkins.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index 723c9ed8..fe94ea2a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3,7 +3,7 @@ AUTOMAKE_OPTIONS = foreign dist-bzip2 1.6 SUBDIRS = include src doc tests contrib EXTRA_DIST = osmoappdesc.py README.md -DISTCHECK_CONFIGURE_FLAGS = \ +AM_DISTCHECK_CONFIGURE_FLAGS = \ --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir) @RELMAKE@ diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 5f819789..ea1675c3 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -77,7 +77,7 @@ set -x autoreconf --install --force ./configure $PCU_CONFIG $MAKE $PARALLEL_MAKE -DISTCHECK_CONFIGURE_FLAGS="$PCU_CONFIG" AM_DISTCHECK_CONFIGURE_FLAGS="$PCU_CONFIG" \ +DISTCHECK_CONFIGURE_FLAGS="$PCU_CONFIG" \ $MAKE distcheck \ || cat-testlogs.sh |