summaryrefslogtreecommitdiff
path: root/script
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2014-05-09 11:48:26 +0200
committerKarolin Seeger <kseeger@samba.org>2014-05-20 11:42:09 +0200
commit7a6173ddce2142d3c0465908f2ced29aee7f32e8 (patch)
tree4df55362574b79dae29c5deebede776299dfd12f /script
parenta76395b3198f2393963f2a8c5e37b6179fef5abe (diff)
downloadsamba-7a6173ddce2142d3c0465908f2ced29aee7f32e8.tar.gz
script/autobuild: make use of --with-perl-{arch,lib}-install-dir
Bug: https://bugzilla.samba.org/show_bug.cgi?id=10472 Signed-off-by: Stefan Metzmacher <metze@samba.org> Reviewed-by: Andreas Schneider <asn@samba.org> (cherry picked from commit d18ee9e4b6f4c9a24b555c111e08396012c1755a)
Diffstat (limited to 'script')
-rwxr-xr-xscript/autobuild.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/script/autobuild.py b/script/autobuild.py
index 3136643fc93..b5f054b6fc2 100755
--- a/script/autobuild.py
+++ b/script/autobuild.py
@@ -212,7 +212,9 @@ class builder(object):
self.cmd = self.cmd.replace("${PYTHON_PREFIX}", get_python_lib(standard_lib=1, prefix=self.prefix))
self.cmd = self.cmd.replace("${PREFIX}", "--prefix=%s" % self.prefix)
self.cmd = self.cmd.replace("${PREFIX_DIR}", "%s" % self.prefix)
- self.cmd = self.cmd.replace("${PERL_VENDOR_LIB}", "--with-perl-vendorlib=%s/share/perl5" % self.prefix)
+ perl_vendor_lib = "--with-perl-arch-install-dir=%s/share/perl5 " % self.prefix
+ perl_vendor_lib += "--with-perl-lib-install-dir=%s/lib/perl5" % self.prefix
+ self.cmd = self.cmd.replace("${PERL_VENDOR_LIB}", perl_vendor_lib)
# if self.output_mime_type == "text/x-subunit":
# self.cmd += " | %s --immediate" % (os.path.join(os.path.dirname(__file__), "selftest/format-subunit"))
print '%s: [%s] Running %s' % (self.name, self.stage, self.cmd)