diff options
| -rw-r--r-- | Debian/Debhelper/Dh_Buildsystems.pm | 15 | ||||
| -rwxr-xr-x | t/buildsystems/buildsystem_tests | 16 |
2 files changed, 11 insertions, 20 deletions
diff --git a/Debian/Debhelper/Dh_Buildsystems.pm b/Debian/Debhelper/Dh_Buildsystems.pm index ac09dd28..d33b6f2c 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, diff --git a/t/buildsystems/buildsystem_tests b/t/buildsystems/buildsystem_tests index e1ca8bbe..031828b7 100755 --- a/t/buildsystems/buildsystem_tests +++ b/t/buildsystems/buildsystem_tests @@ -353,16 +353,16 @@ if (defined \$bs) { EOF } -is_deeply( process_stdout("DH_AUTO_OPTIONS='--builddirectory=autoconf/bld\\ dir --sourcedirectory autoconf' $^X -- -", +is_deeply( process_stdout("$^X -- - --builddirectory='autoconf/bld dir' --sourcedirectory autoconf", get_load_bs_source(undef, "configure")), [ 'NAME=autoconf', 'builddir=autoconf/bld dir', 'makecmd=make', 'sourcedir=autoconf' ], - "dh_auto_options w/space, autoconf autoselection and sourcedir/builddir" ); + "autoconf autoselection and sourcedir/builddir" ); -is_deeply( process_stdout("$^X -- - -cautoconf -d autoconf", get_load_bs_source("autoconf", "build")), +is_deeply( process_stdout("$^X -- - -Sautoconf -D autoconf", get_load_bs_source("autoconf", "build")), [ 'NAME=autoconf', 'builddir=undef', 'makecmd=make', 'sourcedir=autoconf' ], "forced autoconf and sourcedir" ); -is_deeply( process_stdout("$^X -- - -b -cautoconf", get_load_bs_source("autoconf", "build")), +is_deeply( process_stdout("$^X -- - -B -Sautoconf", get_load_bs_source("autoconf", "build")), [ 'NAME=autoconf', "builddir=$default_builddir", 'makecmd=make', 'sourcedir=.' ], "forced autoconf and default build directory" ); @@ -374,11 +374,11 @@ sub dh_auto_do_autoconf { my (@lines, @extra_args); my $buildpath = $sourcedir; - my @dh_auto_args = ("-d", $sourcedir); - my $dh_auto_str = "-d $sourcedir"; + my @dh_auto_args = ("-D", $sourcedir); + my $dh_auto_str = "-D $sourcedir"; if ($builddir) { - push @dh_auto_args, "-b", $builddir; - $dh_auto_str .= " -b $builddir"; + push @dh_auto_args, "-B", $builddir; + $dh_auto_str .= " -B $builddir"; $buildpath = $builddir; } |