r198: Initial Import

6 files changed, 23 insertions, 3 deletions

diff --git a/Dh_Getopt.pm b/Dh_Getopt.pm
index 5f43496b..0c28500d 100644
--- a/Dh_Getopt.pm
+++ b/Dh_Getopt.pm
@@ -114,6 +114,8 @@ sub parseopts {
 		"init-script=s" => \$options{INIT_SCRIPT},
 		
 		"sourcedir=s" => \$options{SOURCEDIR},
+		
+		"destdir=s" => \$options{DESTDIR},
 	);
 
 	if (!$ret) {
diff --git a/debian/changelog b/debian/changelog
index 8208825c..a9c6a0b7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+debhelper (1.2.59) unstable; urgency=low
+
+  * dh_builddeb: added --destdir option, which lets you tell it where
+    to put the generated .deb's. Default is .. of course.
+
+ -- Joey Hess <joeyh@master.debian.org>  Thu, 22 Apr 1999 22:02:01 -0700
+
 debhelper (1.2.58) unstable; urgency=low
 
   * autoscripts/postinst-suid: use /#FILE# in elif test (#36297).
diff --git a/dh_builddeb b/dh_builddeb
index 06cc1beb..9d760b5e 100755
--- a/dh_builddeb
+++ b/dh_builddeb
@@ -6,7 +6,12 @@ BEGIN { push @INC, "debian", "/usr/lib/debhelper" }
 use Dh_Lib;
 init();
 
+# Set the default destination directory.
+if (! defined $dh{DESTDIR}) {
+	$dh{DESTDIR}='..';
+}
+
 foreach $PACKAGE (@{$dh{DOPACKAGES}}) {
 	$TMP=tmpdir($PACKAGE);
-	doit("dpkg","--build",$TMP,"..");
+	doit("dpkg","--build",$TMP,$dh{DESTDIR});
 }
diff --git a/dh_builddeb.1 b/dh_builddeb.1
index cf492b4c..134cd883 100644
--- a/dh_builddeb.1
+++ b/dh_builddeb.1
@@ -3,7 +3,7 @@
 dh_builddeb \- build debian packages
 .SH SYNOPSIS
 .B dh_builddeb
-.I "[debhelper options]"
+.I "[debhelper options] [--destdir=directory]"
 .SH "DESCRIPTION"
 dh_builddeb simply calls
 .BR dpkg (8)
@@ -14,6 +14,10 @@ to build a .deb package or packages.
 See
 .BR debhelper (1)
 for a list of options common to all debhelper commands.
+.TP
+.B --destdir=directory
+Use this if you want the generated .deb files to be put in a directory other
+than the default of ".."
 .SH ENVIRONMENT
 See
 .BR debhelper (1)
diff --git a/dh_installexamples.1 b/dh_installexamples.1
index 61ec0ea0..87ccd1ff 100644
--- a/dh_installexamples.1
+++ b/dh_installexamples.1
@@ -9,7 +9,7 @@ dh_installexamples is a debhelper program that is responsible for installing
 examples into usr/doc/package/examples in package build directories.
 .P
 Any file names specified as parameters will be installed into the first 
-package dh_installdirs is told to act on. By default, this is the first 
+package dh_installexamples is told to act on. By default, this is the first 
 binary package in debian/control, but if you use -p, -i, or -a flags, it
 will be the first package specified by those flags.
 .P
diff --git a/doc/PROGRAMMING b/doc/PROGRAMMING
index e40f0421..5a47fc25 100644
--- a/doc/PROGRAMMING
+++ b/doc/PROGRAMMING
@@ -118,6 +118,8 @@ switch		variable	description
 				dh_installinit will ever use this)
 --sourcedir	SOURCEDIR	will be set to a string (probably only
 				dh_movefiles will ever use this)
+--destdir	DESTDIR		will be set to a string (probably only
+				dh_builddeb will ever use this)
 
 Any additional command line parameters that do not start with "-" will be 
 ignored, and you can access them later just as you normally would.