From f9f7ee8c7a2fe94e4d73ae898bb8007030eed8ad Mon Sep 17 00:00:00 2001 From: Nicolas Thill Date: Tue, 11 Oct 2011 07:13:51 +0000 Subject: [PATCH] [backfire/packages] backport [28402] (distribute) & [28403] (mako) changes SVN-Revision: 28409 --- lang/distribute/Makefile | 6 +++--- lang/mako/Makefile | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lang/distribute/Makefile b/lang/distribute/Makefile index bae9f5c29b..aee3ef3ded 100644 --- a/lang/distribute/Makefile +++ b/lang/distribute/Makefile @@ -41,10 +41,10 @@ define Host/Compile endef define Host/Install - $(INSTALL_DIR) $(STAGING_DIR_HOST)$(PYTHON_PKG_DIR) + $(INSTALL_DIR) $(STAGING_DIR)$(PYTHON_PKG_DIR) $(CP) \ $(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/* \ - $(STAGING_DIR_HOST)$(PYTHON_PKG_DIR) + $(STAGING_DIR)$(PYTHON_PKG_DIR)/ endef define Build/Compile @@ -55,7 +55,7 @@ define Package/distribute/install $(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR) $(CP) \ $(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/* \ - $(1)$(PYTHON_PKG_DIR) + $(1)$(PYTHON_PKG_DIR)/ $(INSTALL_DIR) $(1)/usr/bin $(INSTALL_BIN) \ $(PKG_INSTALL_DIR)/usr/bin/easy_install \ diff --git a/lang/mako/Makefile b/lang/mako/Makefile index ad8f1f7c83..ad935c6c18 100644 --- a/lang/mako/Makefile +++ b/lang/mako/Makefile @@ -27,7 +27,7 @@ define Package/mako CATEGORY:=Languages TITLE:=Mako Templates for Python URL:=http://www.makotemplates.org/ - DEPENDS:=+python @BROKEN + DEPENDS:=+python endef define Package/mako/description @@ -50,7 +50,7 @@ define Package/mako/install $(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR) $(CP) \ $(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/* \ - $(1)$(PYTHON_PKG_DIR) + $(1)$(PYTHON_PKG_DIR)/ endef $(eval $(call BuildPackage,mako)) -- 2.30.2