From c86fd1502b3380b4638c77a93faa8c7ca876e5f0 Mon Sep 17 00:00:00 2001
From: Bdale Garbee <bdale@gag.com>
Date: Sat, 28 Mar 2009 07:02:51 -0600
Subject: [PATCH] clean up some noise in the diff file

---
 config.sub   |  6 +++++-
 configure    |  2 +-
 debian/rules | 19 +++++++++----------
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/config.sub b/config.sub
index 6759825..922d3b5 100755
--- a/config.sub
+++ b/config.sub
@@ -148,7 +148,7 @@ case $os in
 	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
 	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
 	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-	-apple | -axis | -knuth | -cray)
+	-apple | -axis | -knuth | -cray | -sr2201*)
 		os=
 		basic_machine=$1
 		;;
@@ -583,6 +583,10 @@ case $basic_machine in
 		basic_machine=h8500-hitachi
 		os=-hms
 		;;
+	sr2201*)
+		basic_machine=harp1e-hitachi
+		os=-hiuxmpp
+		;;
 	harris)
 		basic_machine=m88k-harris
 		os=-sysv3
diff --git a/configure b/configure
index 8188da6..0bf4e23 100755
--- a/configure
+++ b/configure
@@ -1451,7 +1451,7 @@ Fine tuning of the installation directories:
   --bindir=DIR           user executables [EPREFIX/bin]
   --sbindir=DIR          system admin executables [EPREFIX/sbin]
   --libexecdir=DIR       program executables [EPREFIX/libexec]
-  --sysconfdir=DIR       read-only single-machine data [PREFIX/etc]
+  --sysconfdir=DIR       read-only single-machine data [etc]
   --sharedstatedir=DIR   modifiable architecture-independent data [PREFIX/com]
   --localstatedir=DIR    modifiable single-machine data [PREFIX/var]
   --libdir=DIR           object code libraries [EPREFIX/lib]
diff --git a/debian/rules b/debian/rules
index 3cc6e68..575bb10 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,9 +8,11 @@ CFLAGS += -g
 endif
 export CFLAGS
 
-config: config-stamp
-config-stamp:
+configure: configure-stamp
+configure-stamp:
 	dh_testdir
+	cp -f /usr/share/misc/config.sub config.sub
+	cp -f /usr/share/misc/config.guess config.guess
 
 	# simple version
 	mkdir -p build-simple
@@ -46,9 +48,12 @@ config-stamp:
 	touch config-stamp
 
 build: build-stamp
-build-stamp: config-stamp
+build-stamp: configure-stamp
 	dh_testdir
 
+	# ensure our pod changes get picked up
+	$(MAKE) -C build-simple sudoers.man.in sudo.man.in visudo.man.in
+
 	$(MAKE) -C build-simple
 	$(MAKE) -C build-ldap
 
@@ -60,12 +65,6 @@ clean:
 	rm -f config-stamp build-stamp
 	rm -rf build-simple build-ldap
 	rm -f config.cache
-
-	-test -r /usr/share/misc/config.sub && \
-		cp -f /usr/share/misc/config.sub config.sub
-	-test -r /usr/share/misc/config.guess && \
-		cp -f /usr/share/misc/config.guess config.guess
-
 	dh_clean
 
 install: build-stamp
@@ -115,4 +114,4 @@ binary-arch: build install
 	dh_builddeb
 
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+.PHONY: configure build clean binary-indep binary-arch binary install
-- 
2.47.2