Change in osmo-pcu[master]: Fix DISTCHECK_CONFIGURE_FLAGS override

This is merely a historical archive of years 2008-2021, before the migration to mailman3.

A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.

osmith gerrit-no-reply at lists.osmocom.org
Tue Dec 4 15:11:04 UTC 2018


osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/12107 )

Change subject: Fix DISTCHECK_CONFIGURE_FLAGS override
......................................................................

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
---
M Makefile.am
M contrib/jenkins.sh
2 files changed, 2 insertions(+), 2 deletions(-)

Approvals:
  Jenkins Builder: Verified
  Pau Espin Pedrol: Looks good to me, approved



diff --git a/Makefile.am b/Makefile.am
index 723c9ed..fe94ea2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,7 +3,7 @@
 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 5f81978..ea1675c 100755
--- a/contrib/jenkins.sh
+++ b/contrib/jenkins.sh
@@ -77,7 +77,7 @@
 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
 

-- 
To view, visit https://gerrit.osmocom.org/12107
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-pcu
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I10d1eef9838c0b843a3a4103b7b03e8e9457b69e
Gerrit-Change-Number: 12107
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith at sysmocom.de>
Gerrit-Reviewer: Jenkins Builder (1000002)
Gerrit-Reviewer: Pau Espin Pedrol <pespin at sysmocom.de>
Gerrit-Reviewer: osmith <osmith at sysmocom.de>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20181204/00e80929/attachment.htm>


More information about the gerrit-log mailing list