X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Debian%2FDebhelper%2FDh_Buildsystems.pm;h=47d9d5824f1dccfe1b08f564ca4e40761e01c119;hb=a734bdd7c78b0f3d27d7eacd3d50702d4abe8201;hp=8e9920f1f21b533e66c310e0f2ec14ce016dde2e;hpb=e71d6861d8a40562512b934a70ebde0bb1b2518b;p=debhelper.git

diff --git a/Debian/Debhelper/Dh_Buildsystems.pm b/Debian/Debhelper/Dh_Buildsystems.pm
index 8e9920f..47d9d58 100644
--- a/Debian/Debhelper/Dh_Buildsystems.pm
+++ b/Debian/Debhelper/Dh_Buildsystems.pm
@@ -89,7 +89,7 @@ sub load_all_buildsystems {
 
 	# Push debhelper built-in buildsystems first
 	for my $name (@BUILDSYSTEMS) {
-		error("Debhelper built-in buildsystem '$name' could not be found/loaded")
+		error("debhelper built-in buildsystem '$name' could not be found/loaded")
 		    if not exists $buildsystems{$name};
 		push @buildsystems, $buildsystems{$name};
 		delete $buildsystems{$name};
@@ -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);
 }