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
This commit is contained in:
parent
47aab58ec3
commit
61469d1d86
|
@ -3,7 +3,7 @@ AUTOMAKE_OPTIONS = foreign dist-bzip2 1.6
|
||||||
SUBDIRS = include src doc tests contrib
|
SUBDIRS = include src doc tests contrib
|
||||||
EXTRA_DIST = osmoappdesc.py README.md
|
EXTRA_DIST = osmoappdesc.py README.md
|
||||||
|
|
||||||
DISTCHECK_CONFIGURE_FLAGS = \
|
AM_DISTCHECK_CONFIGURE_FLAGS = \
|
||||||
--with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir)
|
--with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir)
|
||||||
|
|
||||||
@RELMAKE@
|
@RELMAKE@
|
||||||
|
|
|
@ -77,7 +77,7 @@ set -x
|
||||||
autoreconf --install --force
|
autoreconf --install --force
|
||||||
./configure $PCU_CONFIG
|
./configure $PCU_CONFIG
|
||||||
$MAKE $PARALLEL_MAKE
|
$MAKE $PARALLEL_MAKE
|
||||||
DISTCHECK_CONFIGURE_FLAGS="$PCU_CONFIG" AM_DISTCHECK_CONFIGURE_FLAGS="$PCU_CONFIG" \
|
DISTCHECK_CONFIGURE_FLAGS="$PCU_CONFIG" \
|
||||||
$MAKE distcheck \
|
$MAKE distcheck \
|
||||||
|| cat-testlogs.sh
|
|| cat-testlogs.sh
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue