make-rules/shared-macros.mk
branchs11-update
changeset 4227 35a4398c64cb
parent 4005 4bcc81bdda4e
child 4241 9c60eb0ab04b
--- a/make-rules/shared-macros.mk	Wed Apr 29 14:18:37 2015 -0700
+++ b/make-rules/shared-macros.mk	Wed Apr 29 16:36:59 2015 -0700
@@ -329,20 +329,25 @@
 PYTHON_VENDOR_PACKAGES.64 = /usr/lib/python$(PYTHON_VERSION)/vendor-packages/64
 PYTHON_VENDOR_PACKAGES = $(PYTHON_VENDOR_PACKAGES.$(BITS))
 
-PYTHON.2.6.32 =	/usr/bin/python2.6
-PYTHON.2.6.64 =	/usr/bin/$(MACH64)/python2.6
+USRBIN.32 =	/usr/bin
+USRBIN.64 =	/usr/bin/$(MACH64)
+USRBIN =	$(USRBIN.$(BITS))
 
-PYTHON.2.7.32 =	/usr/bin/python2.7
-PYTHON.2.7.64 =	/usr/bin/$(MACH64)/python2.7
-PYTHON.2.7 =	/usr/bin/python2.7
+PYTHON.2.6.32 =	$(USRBIN.32)/python2.6
+PYTHON.2.6.64 =	$(USRBIN.64)/python2.6
+PYTHON.2.6 =	$(USRBIN)/python2.6
+
+PYTHON.2.7.32 =	$(USRBIN.32)/python2.7
+PYTHON.2.7.64 =	$(USRBIN.64)/python2.7
+PYTHON.2.7 =	$(USRBIN)/python2.7
 
 # Although we build Python 3 64-bit only, the BUILD_NO_ARCH macro is written
 # in such a way that we still need the .32 macro below.  And since we build
 # 64-bit only, we stick it directly in usr/bin (i.e., the 32-bit path) rather
 # than the 64-bit path.
-PYTHON.3.4.32 =	/usr/bin/python3.4
-PYTHON.3.4.64 =	/usr/bin/python3.4
-PYTHON.3.4 =	/usr/bin/python3.4
+PYTHON.3.4.32 =	$(USRBIN.32)/python3.4
+PYTHON.3.4.64 =	$(USRBIN.32)/python3.4
+PYTHON.3.4 =	$(USRBIN.32)/python3.4
 
 PYTHON.32 =	$(PYTHON.$(PYTHON_VERSION).32)
 PYTHON.64 =	$(PYTHON.$(PYTHON_VERSION).64)