From ffe38a05c38d561ff59df28ed52363cf4b578f9c Mon Sep 17 00:00:00 2001
From: joey <joey>
Date: Tue, 17 Aug 1999 04:37:17 +0000
Subject: [PATCH] r23: Initial Import

---
 debian/changelog     | 8 ++++++++
 debian/rules         | 5 ++---
 dh_lib               | 2 +-
 examples/rules.multi | 2 ++
 4 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b6a5a49..bbbdb26 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+debhelper (0.17) unstable; urgency=low
+
+  * Added dh_installdirs, automatically creates subdirectories (for
+    compatability with debstd's debian/dirs file.
+  * dh_lib: fixed problem with -P flag.
+
+ -- Joey Hess <joeyh@master.debian.org>  Fri,  7 Nov 1997 16:07:11 -0500
+
 debhelper (0.16) unstable; urgency=low
 
   * dh_compress: always compress changelog and upstream changelog, no 
diff --git a/debian/rules b/debian/rules
index eaaeb54..e2d4da0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -28,15 +28,14 @@ binary-indep: build
 	./dh_testdir $(test_files)
 	./dh_testroot
 	./dh_clean
+	./dh_installdirs usr/bin usr/lib/debhelper
 
-	install -d debian/tmp/usr/bin
 	find . -perm +111 -maxdepth 1 -type f \
 		-exec install -p {} debian/tmp/usr/bin \;
-	install -d debian/tmp/usr/lib/debhelper
 	cp dh_lib debian/tmp/usr/lib/debhelper
 	cp -a autoscripts debian/tmp/usr/lib/debhelper
 
-	./dh_installdocs TODO README
+	./dh_installdocs TODO README BUGS
 	./dh_installexamples examples/*
 	./dh_installmenu
 	./dh_installmanpages
diff --git a/dh_lib b/dh_lib
index c2dd977..8dad88c 100644
--- a/dh_lib
+++ b/dh_lib
@@ -182,6 +182,6 @@ fi
 
 # Check to see if -P was specified. If so, we can only act on a single
 # package.
-if [ "$DH_TMPDIR" ] && echo "$DH_DOPACKAGES" | grep -q " "; then
+if [ "$DH_TMPDIR" ] && echo "$DH_DOPACKAGES" | egrep -q '.+ .+' ; then
 	error "-P was specified, but multiple packages would be acted on."
 fi
diff --git a/examples/rules.multi b/examples/rules.multi
index fbefadd..6fd7088 100755
--- a/examples/rules.multi
+++ b/examples/rules.multi
@@ -27,6 +27,7 @@ binary-indep: build
 	dh_testdir -i
 	dh_testroot -i
 	dh_clean -i
+	dh_installdirs -i
         # Add here commands to install the files into debian/tmp
         #$(MAKE) PREFIX=debian/tmp install
 	dh_installdocs -i
@@ -49,6 +50,7 @@ binary-arch: build
 	dh_testdir -a
 	dh_testroot -a
 	dh_clean -a
+	dh_installdirs -a
 	# Add here commands to install the files into debian/tmp
 	#$(MAKE) PREFIX=debian/tmp install
 	dh_installdocs -a
-- 
2.39.5