From d5e82a031c4aa57091c459d8c05cd278433e7c8b Mon Sep 17 00:00:00 2001 From: Modestas Vainius Date: Sat, 13 Jun 2009 17:31:23 +0300 Subject: New short switches for buildsystem stuff, drop envvars * New short switches: -D = --sourcedirectory -B = --builddirectory -S = --buildsystem * Drop DH_AUTO_BUILD* environment variables (reintroduced due to revert). * Adjust test suite. Signed-off-by: Modestas Vainius --- Debian/Debhelper/Dh_Buildsystems.pm | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) (limited to 'Debian') diff --git a/Debian/Debhelper/Dh_Buildsystems.pm b/Debian/Debhelper/Dh_Buildsystems.pm index ac09dd2..d33b6f2 100644 --- a/Debian/Debhelper/Dh_Buildsystems.pm +++ b/Debian/Debhelper/Dh_Buildsystems.pm @@ -108,24 +108,15 @@ sub load_all_buildsystems { sub buildsystems_init { my %args=@_; - # TODO: Not documented in the manual pages yet. - # Initialize options from environment variables - if (exists $ENV{DH_AUTO_BUILDDIRECTORY}) { - $opt_builddir = $ENV{DH_AUTO_BUILDDIRECTORY}; - } - if (exists $ENV{DH_AUTO_BUILDSYSTEM}) { - $opt_buildsys = $ENV{DH_AUTO_BUILDSYSTEM}; - } - # Available command line options my %options = ( - "d=s" => \$opt_sourcedir, + "D=s" => \$opt_sourcedir, "sourcedirectory=s" => \$opt_sourcedir, - "b:s" => \$opt_builddir, + "B:s" => \$opt_builddir, "builddirectory:s" => \$opt_builddir, - "m=s" => \$opt_buildsys, + "S=s" => \$opt_buildsys, "buildsystem=s" => \$opt_buildsys, "l" => \$opt_list, -- cgit v1.2.1