<p>laforge has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-remsim/+/17357">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">client: Fix 'make distcheck' bypassing pkg-config usbdropdir<br><br>For some strange reason, 'make distcheck' wants to do a 'make install'<br>without using DESTDIR.  In this case, asking pkg-config for the<br>various directories as described in the libpcsclite.pc is of course<br>not working.<br><br>Change-Id: I87c68e8d14f8ddb6054178118ff1f96216483f5c<br>---<br>M configure.ac<br>1 file changed, 7 insertions(+), 3 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-remsim refs/changes/57/17357/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/configure.ac b/configure.ac</span><br><span>index 36c469d..26c330b 100644</span><br><span>--- a/configure.ac</span><br><span>+++ b/configure.ac</span><br><span>@@ -69,13 +69,17 @@</span><br><span>         PKG_CHECK_MODULES(OSMOSIMTRACE2, libosmo-simtrace2)</span><br><span>  PKG_CHECK_MODULES(USB, libusb-1.0)</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-  serialconfdir=`pkg-config --variable=serialconfdir libpcsclite`</span><br><span style="color: hsl(0, 100%, 40%);">- AC_SUBST(serialconfdir)</span><br><span style="color: hsl(0, 100%, 40%);">- ifd_dropdir=`pkg-config --variable=usbdropdir libpcsclite`</span><br><span style="color: hsl(120, 100%, 40%);">+    # we cannot use the below command, as 'make distcheck' would fail due to the lack</span><br><span style="color: hsl(120, 100%, 40%);">+     # of ${prefix} being involved :(</span><br><span style="color: hsl(120, 100%, 40%);">+      #ifd_dropdir=`pkg-config --variable=usbdropdir libpcsclite`</span><br><span style="color: hsl(120, 100%, 40%);">+   #serialconfdir=`pkg-config --variable=serialconfdir libpcsclite`</span><br><span style="color: hsl(120, 100%, 40%);">+      ifd_dropdir="${libdir}/pcsc"</span><br><span style="color: hsl(120, 100%, 40%);">+        serialconfdir="${sysconfdir}/reader.conf.d"</span><br><span>        # allow user to override the dropdir for the PCSC driver bundle</span><br><span>      AC_ARG_WITH(usbdropdir, [--with-usbdropdir      PCSC bundle location],</span><br><span>                               [usbdropdir="${withval}"], [usbdropdir="${ifd_dropdir}"])</span><br><span>        AC_SUBST(usbdropdir)</span><br><span style="color: hsl(120, 100%, 40%);">+  AC_SUBST(serialconfdir)</span><br><span> fi</span><br><span> AM_CONDITIONAL(BUILD_CLIENT, test "x$osmo_ac_build_client" = "xyes")</span><br><span> AC_SUBST(BUILD_CLIENT)</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-remsim/+/17357">change 17357</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/c/osmo-remsim/+/17357"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-remsim </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I87c68e8d14f8ddb6054178118ff1f96216483f5c </div>
<div style="display:none"> Gerrit-Change-Number: 17357 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>