Do multiarch properly

timtheisen · timtheisen · commit f4aff5266faa · 2020-12-10T10:12:18.000-06:00
diff --git a/deb/libscitokens-dev.install b/deb/libscitokens-dev.install
@@ -1,2 +1,2 @@
 debian/tmp/usr/include/scitokens usr/include/
-debian/tmp/usr/lib/libSciTokens.so usr/lib/x86_64-linux-gnu
+debian/tmp/usr/lib/*/libSciTokens.so
diff --git a/deb/libscitokens.install b/deb/libscitokens.install
@@ -1 +1 @@
-debian/tmp/usr/lib/libSciTokens.so.* usr/lib/x86_64-linux-gnu
+debian/tmp/usr/lib/*/libSciTokens.so.*
diff --git a/deb/rules b/deb/rules
@@ -1,5 +1,9 @@
 #!/usr/bin/make -f
 
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
 %:
 	dh $@  
 
+override_dh_auto_configure:
+	dh_auto_configure -- -DLIB_INSTALL_DIR=lib/$(DEB_HOST_MULTIARCH)

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`debian/tmp/usr/include/scitokens usr/include/`
`2`		`-debian/tmp/usr/lib/libSciTokens.so usr/lib/x86_64-linux-gnu`
	`2`	`+debian/tmp/usr/lib/*/libSciTokens.so`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-debian/tmp/usr/lib/libSciTokens.so.* usr/lib/x86_64-linux-gnu`
	`1`	`+debian/tmp/usr/lib//libSciTokens.so.`