makefile cleanup, add missing pygtk prereq check

git-svn-id: svn://svn.openwrt.org/openwrt/packages@12200 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/lang/pygtk/Makefile b/lang/pygtk/Makefile
index 60a67f9..524394c 100644 (file)
--- a/lang/pygtk/Makefile
+++ b/lang/pygtk/Makefile
@@ -44,13 +44,16 @@ define Build/Compile
 endef
 
 define Build/InstallDev
-       mkdir -p $(1)
-       cp -r $(PKG_INSTALL_DIR)/* $(1)
+       $(INSTALL_DIR) $(1)
+       $(CP) $(PKG_INSTALL_DIR)/* $(1)
 endef
 
 define Package/python-gtk/install
-       mkdir -p $(1)
-       cp -r $(PKG_INSTALL_DIR)/* $(1)
+       $(INSTALL_DIR) $(1)
+       $(CP) $(PKG_INSTALL_DIR)/* $(1)
 endef
 
 $(eval $(call BuildPackage,python-gtk))
+$(eval $(call RequireCommand,pygtk-codegen-2.0 \
+       Please install the pygtk 2.0 development package \
+))

diff --git a/lang/python-gnome-desktop2/Makefile b/lang/python-gnome-desktop2/Makefile
index afc2096..6ee2da1 100644 (file)
--- a/lang/python-gnome-desktop2/Makefile
+++ b/lang/python-gnome-desktop2/Makefile
@@ -32,29 +32,16 @@ define Package/gnome-python-desktop/description
   python bindings for gnome
 endef
 
-define Build/Configure
-       (cd $(PKG_BUILD_DIR); \
-               if [ -x $(CONFIGURE_CMD) ]; then \
-                       $(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/ && \
-                       $(CONFIGURE_VARS) \
-                       $(CONFIGURE_CMD) \
-                       $(CONFIGURE_ARGS) ;\
-               fi \
-       )
-endef
-
-define Build/Compile
-       cd $(PKG_BUILD_DIR) ; DESTDIR=$(PKG_INSTALL_DIR) $(MAKE) all install
-endef
+MAKE_FLAGS += DESTDIR=$(PKG_INSTALL_DIR) all install
 
 define Build/InstallDev
-       mkdir -p $(1)
-       cp -r $(PKG_INSTALL_DIR)/* $(1)
+       $(INSTALL_DIR) $(1)
+       $(CP) $(PKG_INSTALL_DIR)/* $(1)
 endef
 
 define Package/gnome-python-desktop/install
-       mkdir -p $(1)
-       cp -r $(PKG_INSTALL_DIR)/* $(1)
+       $(INSTALL_DIR) $(1)
+       $(CP) $(PKG_INSTALL_DIR)/* $(1)
 endef
 
 $(eval $(call BuildPackage,gnome-python-desktop))