summaryrefslogtreecommitdiff
path: root/Debian/Debhelper/Dh_Buildsystems.pm
diff options
context:
space:
mode:
authorModestas Vainius <modestas@vainius.eu>2009-06-13 17:25:31 +0300
committerModestas Vainius <modestas@vainius.eu>2009-06-13 17:30:57 +0300
commit62935f37b81b97baa72efd77a9e913756a60ac2c (patch)
tree99fc241bb40736571cd0bac79619a185e567da23 /Debian/Debhelper/Dh_Buildsystems.pm
parent9be81947e83e65726f2f34311276a153b5178a18 (diff)
Revert "Improvements in DH_OPTIONS handling and DH_AUTO_OPTIONS envvar support."
This mostly reverts commit f897611a77726655aea258af0c4d52a8ce759ebc. Remaining cosmetic changes (all functional changes have been reverted): * Refactoring of option string into split_options_string() sub (no semantic changes though). * Cosmetic change in Dh_Buildsystems.pm. Breaks testsuite.
Diffstat (limited to 'Debian/Debhelper/Dh_Buildsystems.pm')
-rw-r--r--Debian/Debhelper/Dh_Buildsystems.pm17
1 files changed, 10 insertions, 7 deletions
diff --git a/Debian/Debhelper/Dh_Buildsystems.pm b/Debian/Debhelper/Dh_Buildsystems.pm
index 8e9920f..ac09dd2 100644
--- a/Debian/Debhelper/Dh_Buildsystems.pm
+++ b/Debian/Debhelper/Dh_Buildsystems.pm
@@ -108,27 +108,30 @@ 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" => undef, # cancel default D_FLAG option spec
"d=s" => \$opt_sourcedir,
"sourcedirectory=s" => \$opt_sourcedir,
"b:s" => \$opt_builddir,
"builddirectory:s" => \$opt_builddir,
- "c=s" => \$opt_buildsys,
+ "m=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);
}