diff options
| author | Andreas Schneider <asn@samba.org> | 2014-02-28 15:45:51 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2014-03-06 09:59:42 +0100 |
| commit | c2d58c3c2059ef3d43f876df547cbc7256235563 (patch) | |
| tree | 8453b18a275d3ba244900b96be0c0e8bae3b7dd7 | |
| parent | c46aaf1102da5e8ba53e9f89f2f756fe8dce83c5 (diff) | |
| download | samba-c2d58c3c2059ef3d43f876df547cbc7256235563.tar.gz samba-c2d58c3c2059ef3d43f876df547cbc7256235563.tar.xz samba-c2d58c3c2059ef3d43f876df547cbc7256235563.zip | |
Revert "waf: Add option to specify perl vendor dir."
This reverts commit 9b200555fec2e33da9521db388d1839375aa8d83.
Reviewed-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
| -rw-r--r-- | buildtools/wafadmin/Tools/perl.py | 7 | ||||
| -rw-r--r-- | pidl/lib/wscript_build | 2 | ||||
| -rw-r--r-- | pidl/wscript | 2 |
3 files changed, 1 insertions, 10 deletions
diff --git a/buildtools/wafadmin/Tools/perl.py b/buildtools/wafadmin/Tools/perl.py index 90be8d89aa5..a6787a86ecf 100644 --- a/buildtools/wafadmin/Tools/perl.py +++ b/buildtools/wafadmin/Tools/perl.py @@ -103,14 +103,7 @@ def check_perl_ext_devel(conf): else: conf.env.ARCHDIR_PERL = read_out('print $Config{sitearch}')[0] - conf.env.VENDORDIR_PERL = Options.options.perlvendordir - 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-archdir", type="string", dest="perlarchdir", help = 'Specify directory where to install arch specific files', default=None) - opt.add_option("--with-perl-vendordir", - type="string", - dest="perlvendordir", - help="Specify directory where to install perl vendor files", - default='${DATAROOTDIR}/perl5/vendor_perl') diff --git a/pidl/lib/wscript_build b/pidl/lib/wscript_build index 29632d4d99b..9bddf3f39c8 100644 --- a/pidl/lib/wscript_build +++ b/pidl/lib/wscript_build @@ -1,7 +1,7 @@ #!/usr/bin/env python # install the pidl modules -bld.INSTALL_FILES(bld.env.VENDORDIR_PERL, +bld.INSTALL_FILES('${DATAROOTDIR}/perl5', ''' Parse/Pidl.pm Parse/Pidl/Samba4.pm diff --git a/pidl/wscript b/pidl/wscript index 77abb019de9..05d9982adfe 100644 --- a/pidl/wscript +++ b/pidl/wscript @@ -8,8 +8,6 @@ def set_options(opt): def configure(conf): conf.check_tool('perl') - conf.check_perl_ext_devel() - # we need a recent version of MakeMaker to get the right man page names if conf.CHECK_PERL_MANPAGE(): conf.env.PERLMAN1EXT = conf.CHECK_PERL_MANPAGE(section='1') |