From 1b0a68a3d8b6652111c0444808a5e80f52c1d4fc Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Wed, 4 Mar 2020 15:35:18 +0000 Subject: [PATCH] fix debian build after introducing hack around usbdropdir In Change-Id I87c68e8d14f8ddb6054178118ff1f96216483f5c we introduced a hack to fix 'make distcheck' which in turn broke debian packaging. Let's make sure the latter works while the formar also still does. Change-Id: I16f7d0e8b7f63ed58dd4939c88e5276185bc3178 --- debian/rules | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index a36fe36..2714cc0 100755 --- a/debian/rules +++ b/debian/rules @@ -4,6 +4,8 @@ DEBIAN := $(shell dpkg-parsechangelog | grep ^Version: | cut -d' ' -f2) DEBVERS := $(shell echo '$(DEBIAN)' | cut -d- -f1) VERSION := $(shell echo '$(DEBVERS)' | sed -e 's/[+-].*//' -e 's/~//g') +USBDROPDIR := $(shell pkg-config --variable=usbdropdir libpcsclite) + #export DH_VERBOSE=1 export DEB_BUILD_MAINT_OPTIONS = hardening=+all @@ -12,7 +14,9 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all dh $@ --with=systemd --with autoreconf --fail-missing override_dh_auto_configure: - dh_auto_configure -- --with-systemdsystemunitdir=/lib/systemd/system --enable-manuals + dh_auto_configure -- --with-systemdsystemunitdir=/lib/systemd/system \ + --with-usbdropdir=$(USBDROPDIR) \ + --enable-manuals #override_dh_clean: # dh_clean