configure/automake: Remove work-arounds
Change-Id: I97a085248e6cbcd15daf96c0c23f31cdcd02e06b
diff --git a/Makefile.am b/Makefile.am
index 0ff9363..9789ba3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,6 +7,11 @@
EXTRA_DIST = asn1 .version README.md contrib/remsim-apitool.py
+AM_DISTCHECK_CONFIGURE_FLAGS = \
+ --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir) \
+ --with-usbdropdir=$$dc_install_base/$(usbdropdir) \
+ --with-serialconfdir=$$dc_install_base/$(serialconfdir)
+
pkgcofigdir = $(libdir)/pkgconfig
@RELMAKE@
diff --git a/configure.ac b/configure.ac
index 0c1f595..c4d9766 100644
--- a/configure.ac
+++ b/configure.ac
@@ -69,16 +69,14 @@
PKG_CHECK_MODULES(OSMOSIMTRACE2, libosmo-simtrace2)
PKG_CHECK_MODULES(USB, libusb-1.0)
- # 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"
+ ifd_dropdir=`pkg-config --variable=usbdropdir libpcsclite`
# 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)
+ _serialconfdir=`pkg-config --variable=serialconfdir libpcsclite`
+ AC_ARG_WITH(serialconfdir, [--with-serialconfdir PCSC config directory location],
+ [serialconfdir="${withval}"], [serialconfdir="${_serialconfdir}"])
AC_SUBST(serialconfdir)
fi
AM_CONDITIONAL(BUILD_CLIENT, test "x$osmo_ac_build_client" = "xyes")
diff --git a/debian/rules b/debian/rules
index 2714cc0..fddb043 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,7 +15,6 @@
override_dh_auto_configure:
dh_auto_configure -- --with-systemdsystemunitdir=/lib/systemd/system \
- --with-usbdropdir=$(USBDROPDIR) \
--enable-manuals
#override_dh_clean: