From 9b200555fec2e33da9521db388d1839375aa8d83 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Tue, 25 Feb 2014 17:16:37 +0100 Subject: waf: Add option to specify perl vendor dir. BUG: https://bugzilla.samba.org/show_bug.cgi?id=10472 Signed-off-by: Andreas Schneider Reviewed-by: Kai Blin Autobuild-User(master): Andreas Schneider Autobuild-Date(master): Thu Feb 27 11:48:54 CET 2014 on sn-devel-104 --- buildtools/wafadmin/Tools/perl.py | 7 +++++++ pidl/lib/wscript_build | 2 +- pidl/wscript | 2 ++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/buildtools/wafadmin/Tools/perl.py b/buildtools/wafadmin/Tools/perl.py index a6787a86ec..90be8d89aa 100644 --- a/buildtools/wafadmin/Tools/perl.py +++ b/buildtools/wafadmin/Tools/perl.py @@ -103,7 +103,14 @@ 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 9bddf3f39c..29632d4d99 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('${DATAROOTDIR}/perl5', +bld.INSTALL_FILES(bld.env.VENDORDIR_PERL, ''' Parse/Pidl.pm Parse/Pidl/Samba4.pm diff --git a/pidl/wscript b/pidl/wscript index 05d9982adf..77abb019de 100644 --- a/pidl/wscript +++ b/pidl/wscript @@ -8,6 +8,8 @@ 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') -- cgit