diff options
| author | Michael Adam <obnox@samba.org> | 2014-09-04 12:45:48 +0200 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2014-11-17 23:31:10 +0100 |
| commit | 2947da55a04a5ac452fdb3d531339f358a240459 (patch) | |
| tree | c2ed084c7ab7e03b4e0458526f98ef53bb4174c1 /buildtools | |
| parent | 13c1147b6e9b11642302829dccbdb93148548e70 (diff) | |
| download | samba-2947da55a04a5ac452fdb3d531339f358a240459.tar.gz | |
Revert "buildtools: Rename perl vendorarch configure option."
This reverts commit 04685ff4eed9535769d6a5feee7353f1796a4389.
We are reverting buildtools/wafadmin/Tools/perl.py back to upstream state.
Everything special is now in buildtools/wafsamba/samba_perl.py.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=10472
Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Autobuild-User(master): Stefan Metzmacher <metze@samba.org>
Autobuild-Date(master): Tue Sep 9 03:07:20 CEST 2014 on sn-devel-104
(cherry picked from commit 1f878b9986523ce9e35dd74ae3c201f4e55f66f3)
Autobuild-User(v4-1-test): Karolin Seeger <kseeger@samba.org>
Autobuild-Date(v4-1-test): Mon Nov 17 23:31:10 CET 2014 on sn-devel-104
Diffstat (limited to 'buildtools')
| -rw-r--r-- | buildtools/wafadmin/Tools/perl.py | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/buildtools/wafadmin/Tools/perl.py b/buildtools/wafadmin/Tools/perl.py index 99e0540ca3a..a6787a86ecf 100644 --- a/buildtools/wafadmin/Tools/perl.py +++ b/buildtools/wafadmin/Tools/perl.py @@ -98,17 +98,12 @@ def check_perl_ext_devel(conf): conf.env.EXTUTILS_TYPEMAP = read_out('print "$Config{privlib}/ExtUtils/typemap"') conf.env.perlext_PATTERN = '%s.' + read_out('print $Config{dlext}')[0] - if getattr(Options.options, 'perl_vendorarch_dir', None): - conf.env.PERL_VENDORARCH_DIR = Options.options.perl_vendorarch_dir + if getattr(Options.options, 'perlarchdir', None): + conf.env.ARCHDIR_PERL = Options.options.perlarchdir else: - conf.env.PERL_VENDORARCH_DIR = read_out('print $Config{vendorarch}')[0] + conf.env.ARCHDIR_PERL = read_out('print $Config{sitearch}')[0] def set_options(opt): opt.add_option("--with-perl-binary", type="string", dest="perlbinary", help = 'Specify alternate perl binary', default=None) - - opt.add_option("--with-perl-vendorarch", - type="string", - dest="perl_vendorarch_dir", - help = ('Specify directory where to install arch specific files'), - default=None) + opt.add_option("--with-perl-archdir", type="string", dest="perlarchdir", help = 'Specify directory where to install arch specific files', default=None) |