From 03e37cbca5023308bbe7da3f4e4e8a66890e51aa Mon Sep 17 00:00:00 2001 Message-Id: <03e37cbca5023308bbe7da3f4e4e8a66890e51aa.1716249014.git.mdw@distorted.org.uk> From: Mark Wooding Date: Wed, 16 Aug 2017 05:47:18 +0100 Subject: [PATCH] debian/: Redo the multiarch support for Debhelper 9. Organization: Straylight/Edgeware From: Mark Wooding --- Makefile.am | 2 +- debian/compat | 2 +- debian/rules | 1 + debian/tripe.install | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Makefile.am b/Makefile.am index e00e796b..046247a7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -84,7 +84,7 @@ SUBDIRS += t ###-------------------------------------------------------------------------- ### Package-configuration file. -pkgconfigdir = $(libdir)/pkgconfig +pkgconfigdir = $(datadir)/pkgconfig pkgconfig_DATA = tripe.pc EXTRA_DIST += tripe.pc.in CLEANFILES += tripe.pc diff --git a/debian/compat b/debian/compat index 45a4fb75..ec635144 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -8 +9 diff --git a/debian/rules b/debian/rules index b45a6be5..c1eb564d 100755 --- a/debian/rules +++ b/debian/rules @@ -9,6 +9,7 @@ OVERRIDES += auto_configure dh_auto_configure_OPTS = -- ## Various files and directories. +dh_auto_configure_OPTS += --libdir="\$${prefix}/lib" dh_auto_configure_OPTS += --libexecdir="\$${libdir}/tripe" dh_auto_configure_OPTS += --with-configdir="/etc/tripe" dh_auto_configure_OPTS += --with-socketdir="/var/run" diff --git a/debian/tripe.install b/debian/tripe.install index d6a2b212..d0c322cb 100644 --- a/debian/tripe.install +++ b/debian/tripe.install @@ -6,7 +6,7 @@ debian/tmp/usr/share/man/man7/tripe-service.7tripe debian/tmp/usr/share/man/man8/tripe.8tripe debian/tmp/usr/lib/tripe/tripe-privhelper debian/tmp/usr/share/man/man8/tripe-privhelper.8tripe -debian/tmp/usr/lib/pkgconfig/tripe.pc +debian/tmp/usr/share/pkgconfig/tripe.pc debian/build/contrib/tripe-ipif /usr/share/doc/tripe/examples debian/build/contrib/ipif-peers /usr/share/doc/tripe/examples -- [mdw]