python packaging related cleanups for rdiff-backup and rrdtool

git-svn-id: svn://svn.openwrt.org/openwrt/packages@12336 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nbd 2008-08-17 16:21:41 +00:00
parent be2ad18f2c
commit 2d5444a55d
2 changed files with 2 additions and 6 deletions

View File

@ -20,9 +20,6 @@ PKG_BUILD_DEPENDS:=python
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
-include $(if $(DUMP),,$(STAGING_DIR)/mk/python-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 define Package/rdiff-backup
SUBMENU:=Python SUBMENU:=Python
@ -48,6 +45,7 @@ define PyPackage/rdiff-backup/filespec
endef endef
define Build/Compile define Build/Compile
$(if $(Build/Compile/PyMod),,@echo Python packaging code not found.; false)
$(call Build/Compile/PyMod,., \ $(call Build/Compile/PyMod,., \
build --librsync-dir="$(STAGING_DIR)/usr" , \ build --librsync-dir="$(STAGING_DIR)/usr" , \
) )

View File

@ -21,9 +21,6 @@ PKG_FIXUP = libtool
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
-include $(if $(DUMP),,$(STAGING_DIR)/mk/python-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 define Package/rrdtool/Default
SECTION:=utils SECTION:=utils
@ -94,6 +91,7 @@ else
endif endif
define Build/Compile 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 $(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" all install
endef endef