From 2d5444a55d2c93c235d47949f830d3c0d2081d7f Mon Sep 17 00:00:00 2001 From: nbd Date: Sun, 17 Aug 2008 16:21:41 +0000 Subject: [PATCH] python packaging related cleanups for rdiff-backup and rrdtool git-svn-id: svn://svn.openwrt.org/openwrt/packages@12336 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- utils/rdiff-backup/Makefile | 4 +--- utils/rrdtool/Makefile | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/utils/rdiff-backup/Makefile b/utils/rdiff-backup/Makefile index 4172ade55..5a2fc01dc 100644 --- a/utils/rdiff-backup/Makefile +++ b/utils/rdiff-backup/Makefile @@ -20,9 +20,6 @@ PKG_BUILD_DEPENDS:=python include $(INCLUDE_DIR)/package.mk -include $(if $(DUMP),,$(STAGING_DIR)/mk/python-package.mk) -ifneq ($(MAKECMDGOALS),download) - $(if $(DUMP)$(Build/Compile/PyMod),,$(error Python packaging code not found.)) -endif define Package/rdiff-backup SUBMENU:=Python @@ -48,6 +45,7 @@ define PyPackage/rdiff-backup/filespec endef define Build/Compile + $(if $(Build/Compile/PyMod),,@echo Python packaging code not found.; false) $(call Build/Compile/PyMod,., \ build --librsync-dir="$(STAGING_DIR)/usr" , \ ) diff --git a/utils/rrdtool/Makefile b/utils/rrdtool/Makefile index 475f9a413..ecff3ff3d 100644 --- a/utils/rrdtool/Makefile +++ b/utils/rrdtool/Makefile @@ -21,9 +21,6 @@ PKG_FIXUP = libtool include $(INCLUDE_DIR)/package.mk -include $(if $(DUMP),,$(STAGING_DIR)/mk/python-package.mk) -ifneq ($(MAKECMDGOALS),download) - $(if $(DUMP)$(Build/Compile/PyMod),,$(error Python packaging code not found.)) -endif define Package/rrdtool/Default SECTION:=utils @@ -94,6 +91,7 @@ else endif define Build/Compile + $(if $(Build/Compile/PyMod),,@echo Python packaging code not found.; false) $(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" all install endef -- 2.11.0