From 7c980e275971d46a2be50ebe564c0125cb759727 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 9 Nov 2010 22:15:42 +0100 Subject: try to fix bzr, unify python support --- package/cherrypy/Makefile | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'package/cherrypy') diff --git a/package/cherrypy/Makefile b/package/cherrypy/Makefile index 00de2f994..90df54b04 100644 --- a/package/cherrypy/Makefile +++ b/package/cherrypy/Makefile @@ -16,20 +16,17 @@ PKG_SITES:= http://download.cherrypy.org/cherrypy/3.2.0rc1/ include $(TOPDIR)/mk/package.mk -$(eval $(call PKG_template,CHERRYPY,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,CHERRYPY,cherrypy,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIG_STYLE:= manual BUILD_STYLE:= manual INSTALL_STYLE:= manual -PYTHON_VERSION=2.7 -PYTHON_DIR:=$(STAGING_TOOLS) -PYTHON_LIB_DIR:=$(PYTHON_DIR)/lib -PYTHON:=${STAGING_TOOLS}/bin/hostpython +include $(TOPDIR)/mk/python.mk do-build: - cd $(WRKBUILD); env PYTHONPATH=$(PYTHON_LIB_DIR) $(PYTHON) ./setup.py build - cd $(WRKBUILD); env PYTHONPATH=$(PYTHON_LIB_DIR) $(PYTHON) ./setup.py install --prefix="$(WRKINST)/usr" + cd $(WRKBUILD); env PYTHONPATH=$(PYTHON_LIBDIR) $(PYTHON) ./setup.py build + cd $(WRKBUILD); env PYTHONPATH=$(PYTHON_LIBDIR) $(PYTHON) ./setup.py install --prefix="$(WRKINST)/usr" do-install: $(INSTALL_DIR) $(IDIR_CHERRYPY)/usr/bin -- cgit v1.2.3