New short switches for buildsystem stuff, drop envvars

[debhelper.git] / Debian / Debhelper / Dh_Buildsystems.pm

diff --git a/Debian/Debhelper/Dh_Buildsystems.pm b/Debian/Debhelper/Dh_Buildsystems.pm
index d79034b14b8be3ddcfe582b1cfa320adfd64af2f..d33b6f2cebb04ecf2ceb52054c6d30ba90f9db67 100644 (file)
--- a/Debian/Debhelper/Dh_Buildsystems.pm
+++ b/Debian/Debhelper/Dh_Buildsystems.pm
@@ -110,25 +110,19 @@ sub buildsystems_init {
 
        # Available command line options
        my %options = (
-           "d" => undef, # cancel default D_FLAG option spec
-           "d=s" => \$opt_sourcedir,
+           "D=s" => \$opt_sourcedir,
            "sourcedirectory=s" => \$opt_sourcedir,
        
-           "b:s" => \$opt_builddir,
+           "B:s" => \$opt_builddir,
            "builddirectory:s" => \$opt_builddir,
 
-           "c=s" => \$opt_buildsys,
+           "S=s" => \$opt_buildsys,
            "buildsystem=s" => \$opt_buildsys,
 
            "l" => \$opt_list,
            "--list" => \$opt_list,
        );
        $args{options}{$_} = $options{$_} foreach keys(%options);
-
-       # Pass options from the DH_AUTO_OPTIONS environment variable
-       if (defined $ENV{DH_AUTO_OPTIONS}) {
-               $args{extra_args} = $ENV{DH_AUTO_OPTIONS};
-       }
        Debian::Debhelper::Dh_Lib::init(%args);
 }
 
@@ -137,7 +131,7 @@ sub buildsystems_list {
 
        # List buildsystems (including auto and specified status)
        my ($auto, $specified);
-       my @buildsystems = load_all_buildsystems(undef);
+       my @buildsystems = load_all_buildsystems();
        for my $inst (@buildsystems) {
                my $is_specified = defined $opt_buildsys && $opt_buildsys eq $inst->NAME();
                if (! defined $specified && defined $opt_buildsys && $opt_buildsys eq $inst->NAME()) {