projects / openwrt / svn-archive / archive.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: ef1d704)
python packaging related cleanups for rdiff-backup and rrdtool
authorFelix Fietkau <nbd@openwrt.org>
Sun, 17 Aug 2008 16:21:41 +0000 (16:21 +0000)
committerFelix Fietkau <nbd@openwrt.org>
Sun, 17 Aug 2008 16:21:41 +0000 (16:21 +0000)
SVN-Revision: 12336

utils/rdiff-backup/Makefile patch | blob | history
utils/rrdtool/Makefile patch | blob | history

diff --git a/utils/rdiff-backup/Makefile b/utils/rdiff-backup/Makefile
index 4172ade554698ba02765ef7f6cb2e99ffbdbb0e1..5a2fc01dcd7bf383cb8674b50b78cd3e47e22f6d 100644 (file)
--- 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)
 
 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
 
 define Package/rdiff-backup
   SUBMENU:=Python
@@ -48,6 +45,7 @@ define PyPackage/rdiff-backup/filespec
 endef
 
 define Build/Compile
 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" , \
        )
        $(call Build/Compile/PyMod,., \
                build --librsync-dir="$(STAGING_DIR)/usr" , \
        )
diff --git a/utils/rrdtool/Makefile b/utils/rrdtool/Makefile
index 475f9a4132217d68a5b6f37689037e4990e7b68a..ecff3ff3de32f5594579d57d2700016f62dbb493 100644 (file)
--- 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)
 
 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
 
 define Package/rrdtool/Default
   SECTION:=utils
@@ -94,6 +91,7 @@ else
 endif
 
 define Build/Compile
 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
 
        $(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" all install
 endef
 
OpenWrt SVN history