From 2bf081d153856ac872daff36ed2e6b8fd872f2ae Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Mon, 22 Oct 2018 17:11:23 -0700
Subject: [PATCH] debian: use dh_auto_configure instead of open-coding
 configuration

This ensures that various debian defaults are used, including
architecture-specific library directories and hardening options.

Note that this changes where the .la files are installed, hence the
additional patch where those files are modified.

Signed-off-by: Keith Packard <keithp@keithp.com>
---
 debian/rules | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/debian/rules b/debian/rules
index 553d595d..e461ca71 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,7 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
 
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 export DH_VERBOSE=1
 PKG_VERSION := $(shell dpkg-parsechangelog | sed -ne 's/^Version: \(.*\)/\1/p')
 
@@ -8,14 +9,11 @@ PKG_VERSION := $(shell dpkg-parsechangelog | sed -ne 's/^Version: \(.*\)/\1/p')
 prebuild:
 	echo "not frobbing changelog for official builds"
 
+configure_flags = --disable-install-shared-mime-info --enable-faketime
+
 configure: configure-stamp
 configure-stamp:
-	dh_testdir
-	./autogen.sh \
-		--prefix=/usr \
-		--disable-install-shared-mime-info \
-		--enable-faketime
-	touch configure-stamp
+	dh_auto_configure -- $(configure_flags) && touch $@
 
 build: build-arch build-indep
 build-arch: build-stamp
@@ -42,7 +40,7 @@ install: build
 	dh_installdirs
 
 	$(MAKE) DESTDIR=$(CURDIR)/debian/altos install
-	sed -i "/dependency_libs/ s/'.*'/''/" `find debian/altos/usr/lib/altos/ -name '*.la'`
+	sed -i "/dependency_libs/ s/'.*'/''/" `find debian/altos/ -name '*.la'`
 
 binary-indep: install
 
-- 
2.30.2