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>

diff --git a/buildtools/wafadmin/Tools/perl.py b/buildtools/wafadmin/Tools/perl.py
index 90be8d89aa5fecfe8abb103f62adc46072729de7..a6787a86ecfa86d41593fb01c561e145d6825738 100644 (file)
--- 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 29632d4d99b8286529703493301c42843a5c4f95..9bddf3f39c89097fe0043e4c98c1f9d8fc37d1cb 100644 (file)
--- 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 77abb019de9bd5675c37ad1c8d3f969dc51a0b6d..05d9982adfecf44c79f44fd28e26dcb735c6561e 100644 (file)
--- 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')