From 2403e515e6fc05ba1164718857af918e22398c17 Mon Sep 17 00:00:00 2001 From: Lauri Tirkkonen Date: Tue, 21 May 2019 12:39:47 +0000 Subject: [PATCH] shared-macros: use python vendor-packages dir without /64 in it --- make-rules/shared-macros.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/make-rules/shared-macros.mk b/make-rules/shared-macros.mk index 26971dddb..8ac90a189 100644 --- a/make-rules/shared-macros.mk +++ b/make-rules/shared-macros.mk @@ -561,11 +561,11 @@ LINT = $(lint.$(BITS)) LD = /usr/bin/ld.sun PYTHON.2.7.VENDOR_PACKAGES.32 = /usr/lib/python2.7/vendor-packages -PYTHON.2.7.VENDOR_PACKAGES.64 = /usr/lib/python2.7/vendor-packages/64 +PYTHON.2.7.VENDOR_PACKAGES.64 = /usr/lib/python2.7/vendor-packages PYTHON.2.7.VENDOR_PACKAGES = $(PYTHON.2.7.VENDOR_PACKAGES.$(BITS)) PYTHON.3.4.VENDOR_PACKAGES.32 = /usr/lib/python3.4/vendor-packages -PYTHON.3.4.VENDOR_PACKAGES.64 = /usr/lib/python3.4/vendor-packages/64 +PYTHON.3.4.VENDOR_PACKAGES.64 = /usr/lib/python3.4/vendor-packages PYTHON.3.4.VENDOR_PACKAGES = $(PYTHON.3.4.VENDOR_PACKAGES.$(BITS)) ifeq ($(strip $(PARFAIT_BUILD)),yes) @@ -607,7 +607,7 @@ RUBY_SCRIPT_FIX_FUNC = \ RUBY_VERSIONS = $(RUBY_LIB_VERSION) PYTHON_VENDOR_PACKAGES.32 = /usr/lib/python$(PYTHON_VERSION)/vendor-packages -PYTHON_VENDOR_PACKAGES.64 = /usr/lib/python$(PYTHON_VERSION)/vendor-packages/64 +PYTHON_VENDOR_PACKAGES.64 = /usr/lib/python$(PYTHON_VERSION)/vendor-packages PYTHON_VENDOR_PACKAGES = $(PYTHON_VENDOR_PACKAGES.$(BITS)) PYTHON.2.7.32 = /usr/bin/false -- 2.11.4.GIT