chiark / gitweb /
debian/: Redo the multiarch support for Debhelper 9.
authorMark Wooding <mdw@distorted.org.uk>
Wed, 16 Aug 2017 04:47:18 +0000 (05:47 +0100)
committerMark Wooding <mdw@distorted.org.uk>
Wed, 16 Aug 2017 04:47:43 +0000 (05:47 +0100)
Makefile.am
debian/compat
debian/rules
debian/tripe.install

index e00e796..046247a 100644 (file)
@@ -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
index 45a4fb7..ec63514 100644 (file)
@@ -1 +1 @@
-8
+9
index b45a6be..c1eb564 100755 (executable)
@@ -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"
index d6a2b21..d0c322c 100644 (file)
@@ -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