From: Stefan Metzmacher <metze@samba.org>
Date: Wed, 12 Nov 2014 10:34:00 +0000 (+0100)
Subject: Revert "script/autobuild: make use of --with-perl-{arch,lib}-install-dir"
X-Git-Tag: samba-4.0.23~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cba45a033e07f5e23c2ddb4133eab59411c36e5f;p=thirdparty%2Fsamba.git

Revert "script/autobuild: make use of --with-perl-{arch,lib}-install-dir"

This reverts commit d6043d62521391cf9c1d5b0f7f11618c6c3b46fb.
---

diff --git a/script/autobuild.py b/script/autobuild.py
index a54cb157bc2..d0d451b7d2a 100755
--- a/script/autobuild.py
+++ b/script/autobuild.py
@@ -232,9 +232,7 @@ 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)
-        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)
+        self.cmd = self.cmd.replace("${PERL_VENDOR_LIB}", "--with-perl-vendorlib=%s/share/perl5" % self.prefix)
 #        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)