Revert "script/autobuild: make use of --with-perl-{arch,lib}-install-dir"
authorStefan Metzmacher <metze@samba.org>
Wed, 12 Nov 2014 10:44:39 +0000 (11:44 +0100)
committerKarolin Seeger <kseeger@samba.org>
Mon, 17 Nov 2014 20:21:13 +0000 (21:21 +0100)
This reverts commit 7a6173ddce2142d3c0465908f2ced29aee7f32e8.

script/autobuild.py

index 315ba3fabda0f48f77f94ac1ae43d65624a5d674..29de1979f3e339aeeb66b5f811b0b1d7f2b6e52f 100755 (executable)
@@ -212,9 +212,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)