<p>laforge has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-remsim/+/17367">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">configure/automake: Remove work-arounds<br><br>Change-Id: I97a085248e6cbcd15daf96c0c23f31cdcd02e06b<br>---<br>M Makefile.am<br>M configure.ac<br>M debian/rules<br>3 files changed, 9 insertions(+), 7 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/67/17367/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/Makefile.am b/Makefile.am</span><br><span>index 0ff9363..9789ba3 100644</span><br><span>--- a/Makefile.am</span><br><span>+++ b/Makefile.am</span><br><span>@@ -7,6 +7,11 @@</span><br><span> </span><br><span> EXTRA_DIST = asn1 .version README.md contrib/remsim-apitool.py</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+AM_DISTCHECK_CONFIGURE_FLAGS = \</span><br><span style="color: hsl(120, 100%, 40%);">+        --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir) \</span><br><span style="color: hsl(120, 100%, 40%);">+       --with-usbdropdir=$$dc_install_base/$(usbdropdir) \</span><br><span style="color: hsl(120, 100%, 40%);">+   --with-serialconfdir=$$dc_install_base/$(serialconfdir)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> pkgcofigdir = $(libdir)/pkgconfig</span><br><span> </span><br><span> @RELMAKE@</span><br><span>diff --git a/configure.ac b/configure.ac</span><br><span>index 0c1f595..c4d9766 100644</span><br><span>--- a/configure.ac</span><br><span>+++ b/configure.ac</span><br><span>@@ -69,16 +69,14 @@</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%);">-  # we cannot use the below command, as 'make distcheck' would fail due to the lack</span><br><span style="color: hsl(0, 100%, 40%);">-       # of ${prefix} being involved :(</span><br><span style="color: hsl(0, 100%, 40%);">-        #ifd_dropdir=`pkg-config --variable=usbdropdir libpcsclite`</span><br><span style="color: hsl(0, 100%, 40%);">-     #serialconfdir=`pkg-config --variable=serialconfdir libpcsclite`</span><br><span style="color: hsl(0, 100%, 40%);">-        ifd_dropdir="${libdir}/pcsc"</span><br><span style="color: hsl(0, 100%, 40%);">-  serialconfdir="${sysconfdir}/reader.conf.d"</span><br><span style="color: hsl(120, 100%, 40%);">+ ifd_dropdir=`pkg-config --variable=usbdropdir libpcsclite`</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%);">+  _serialconfdir=`pkg-config --variable=serialconfdir libpcsclite`</span><br><span style="color: hsl(120, 100%, 40%);">+      AC_ARG_WITH(serialconfdir, [--with-serialconfdir PCSC config directory location],</span><br><span style="color: hsl(120, 100%, 40%);">+                             [serialconfdir="${withval}"], [serialconfdir="${_serialconfdir}"])</span><br><span>       AC_SUBST(serialconfdir)</span><br><span> fi</span><br><span> AM_CONDITIONAL(BUILD_CLIENT, test "x$osmo_ac_build_client" = "xyes")</span><br><span>diff --git a/debian/rules b/debian/rules</span><br><span>index 2714cc0..fddb043 100755</span><br><span>--- a/debian/rules</span><br><span>+++ b/debian/rules</span><br><span>@@ -15,7 +15,6 @@</span><br><span> </span><br><span> override_dh_auto_configure:</span><br><span>        dh_auto_configure --    --with-systemdsystemunitdir=/lib/systemd/system \</span><br><span style="color: hsl(0, 100%, 40%);">-                               --with-usbdropdir=$(USBDROPDIR) \</span><br><span>                            --enable-manuals</span><br><span> </span><br><span> #override_dh_clean:</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-remsim/+/17367">change 17367</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/+/17367"/><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: I97a085248e6cbcd15daf96c0c23f31cdcd02e06b </div>
<div style="display:none"> Gerrit-Change-Number: 17367 </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>