sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-22 22:04:08 +03:00
Code

Revert "waf: Add option to specify perl vendor dir."

Browse Source 
This reverts commit 9b200555fec2e33da9521db388d1839375aa8d83.

Reviewed-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
This commit is contained in:
Andreas Schneider 2014-02-28 15:45:51 +01:00 committed by Stefan Metzmacher
parent c46aaf1102
commit c2d58c3c20
3 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
buildtools/wafadmin/Tools/perl.py
View File

@ -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')

2
pidl/lib/wscript_build
View File

@ -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

2
pidl/wscript
View File

@ -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')