From ff17ebb2ff55678e48b0bcfcc29254e45530243b Mon Sep 17 00:00:00 2001 From: Danek Duvall <danek.duvall@oracle.com> Date: Wed, 11 Aug 2010 18:18:07 +0200 Subject: [PATCH] Removed $(PUBLISHER) from pkg.fmri package attributes. Renamed package manifests to .p5m. Made setup.py-based components install to vendor-packages instead of site-packages. --- make-rules/setup.py.mk | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/make-rules/setup.py.mk b/make-rules/setup.py.mk index 5abada0..b4a2b32 100644 --- a/make-rules/setup.py.mk +++ b/make-rules/setup.py.mk @@ -36,10 +36,16 @@ $(COMPONENT_POST_BUILD_ACTION) $(TOUCH) $@ +# The default is site-packages, but that directory belongs to the end-user. +# Modules which are shipped by the OS but not with the core Python distribution +# belong in vendor-packages. +PYTHON_LIB= /usr/lib/python$(PYTHON_VERSION)/vendor-packages + # install the built source into a prototype area $(COMPONENT_SRC)/build-%/.installed: $(COMPONENT_SRC)/build-%/.built $(COMPONENT_PRE_INSTALL_ACTION) (cd $(COMPONENT_SRC) ; $(ENV) $(PYTHON_ENV) \ - $(PYTHON.$(BITS)) ./setup.py install --root $(PROTO_DIR)) + $(PYTHON.$(BITS)) ./setup.py install --root $(PROTO_DIR) \ + --install-lib=$(PYTHON_LIB)) $(COMPONENT_POST_INSTALL_ACTION) $(TOUCH) $@ -- Gitblit v1.9.3