<p>osmith <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/12107">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Jenkins Builder: Verified
  Pau Espin Pedrol: Looks good to me, approved

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Fix DISTCHECK_CONFIGURE_FLAGS override<br><br>Set AM_DISTCHECK_CONFIGURE_FLAGS in Makefile.am instead of<br>DISTCHECK_CONFIGURE_FLAGS. This is the recommended way from the<br>automake manual, as otherwise the flag can't be changed by the user<br>anymore.<br><br>Related: OS#3718<br>Change-Id: I10d1eef9838c0b843a3a4103b7b03e8e9457b69e<br>---<br>M Makefile.am<br>M contrib/jenkins.sh<br>2 files changed, 2 insertions(+), 2 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/Makefile.am b/Makefile.am</span><br><span>index 723c9ed..fe94ea2 100644</span><br><span>--- a/Makefile.am</span><br><span>+++ b/Makefile.am</span><br><span>@@ -3,7 +3,7 @@</span><br><span> SUBDIRS = include src doc tests contrib</span><br><span> EXTRA_DIST = osmoappdesc.py README.md</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-DISTCHECK_CONFIGURE_FLAGS = \</span><br><span style="color: hsl(120, 100%, 40%);">+AM_DISTCHECK_CONFIGURE_FLAGS = \</span><br><span>    --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir)</span><br><span> </span><br><span> @RELMAKE@</span><br><span>diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh</span><br><span>index 5f81978..ea1675c 100755</span><br><span>--- a/contrib/jenkins.sh</span><br><span>+++ b/contrib/jenkins.sh</span><br><span>@@ -77,7 +77,7 @@</span><br><span> autoreconf --install --force</span><br><span> ./configure $PCU_CONFIG</span><br><span> $MAKE $PARALLEL_MAKE</span><br><span style="color: hsl(0, 100%, 40%);">-DISTCHECK_CONFIGURE_FLAGS="$PCU_CONFIG" AM_DISTCHECK_CONFIGURE_FLAGS="$PCU_CONFIG" \</span><br><span style="color: hsl(120, 100%, 40%);">+DISTCHECK_CONFIGURE_FLAGS="$PCU_CONFIG" \</span><br><span>   $MAKE distcheck \</span><br><span>   || cat-testlogs.sh</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/12107">change 12107</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/12107"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-pcu </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I10d1eef9838c0b843a3a4103b7b03e8e9457b69e </div>
<div style="display:none"> Gerrit-Change-Number: 12107 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: Pau Espin Pedrol <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: osmith <osmith@sysmocom.de> </div>