Change in osmo-remsim[master]: client: Fix 'make distcheck' bypassing pkg-config usbdropdir

[laforge]

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-remsim/+/17357 )


Change subject: client: Fix 'make distcheck' bypassing pkg-config usbdropdir
......................................................................

client: Fix 'make distcheck' bypassing pkg-config usbdropdir

For some strange reason, 'make distcheck' wants to do a 'make install'
without using DESTDIR.  In this case, asking pkg-config for the
various directories as described in the libpcsclite.pc is of course
not working.

Change-Id: I87c68e8d14f8ddb6054178118ff1f96216483f5c
---
M configure.ac
1 file changed, 7 insertions(+), 3 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-remsim refs/changes/57/17357/1

diff --git a/configure.ac b/configure.ac
index 36c469d..26c330b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -69,13 +69,17 @@
 	PKG_CHECK_MODULES(OSMOSIMTRACE2, libosmo-simtrace2)
 	PKG_CHECK_MODULES(USB, libusb-1.0)
 
-	serialconfdir=`pkg-config --variable=serialconfdir libpcsclite`
-	AC_SUBST(serialconfdir)
-	ifd_dropdir=`pkg-config --variable=usbdropdir libpcsclite`
+	# we cannot use the below command, as 'make distcheck' would fail due to the lack
+	# of ${prefix} being involved :(
+	#ifd_dropdir=`pkg-config --variable=usbdropdir libpcsclite`
+	#serialconfdir=`pkg-config --variable=serialconfdir libpcsclite`
+	ifd_dropdir="${libdir}/pcsc"
+	serialconfdir="${sysconfdir}/reader.conf.d"
 	# allow user to override the dropdir for the PCSC driver bundle
 	AC_ARG_WITH(usbdropdir, [--with-usbdropdir	PCSC bundle location],
 				[usbdropdir="${withval}"], [usbdropdir="${ifd_dropdir}"])
 	AC_SUBST(usbdropdir)
+	AC_SUBST(serialconfdir)
 fi
 AM_CONDITIONAL(BUILD_CLIENT, test "x$osmo_ac_build_client" = "xyes")
 AC_SUBST(BUILD_CLIENT)

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/17357
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-remsim
Gerrit-Branch: master
Gerrit-Change-Id: I87c68e8d14f8ddb6054178118ff1f96216483f5c
Gerrit-Change-Number: 17357
Gerrit-PatchSet: 1
Gerrit-Owner: laforge <laforge at osmocom.org>
Gerrit-MessageType: newchange
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20200304/b9126c29/attachment.htm>