revert fluxbox rev update

[openwrt/svn-archive/archive.git] / XOrg / app / fluxbox / Makefile

diff --git a/XOrg/app/fluxbox/Makefile b/XOrg/app/fluxbox/Makefile
index eaa1c843a196fa97725fc07e28aa8fe162fde722..b5d296e1ef1a71c5dac57756acb7100c526a3088 100644 (file)
--- a/XOrg/app/fluxbox/Makefile
+++ b/XOrg/app/fluxbox/Makefile
@@ -31,7 +31,7 @@ endef
 
 define Package/fluxbox
 $(call Package/fluxbox/Default)
-  DEPENDS:=+xorg-server-essentials +uclibcxx +xterm @TARGET_x86
+  DEPENDS:=+xorg-server-essentials +uclibcxx +xterm @DISPLAY_SUPPORT
   TITLE:=fluxbox window manager
   MENU:=1
 endef
@@ -42,18 +42,6 @@ $(call Package/fluxbox/Default)
   TITLE:=fluxbox tool to run applications
 endef
 
-define Package/fbsetroot
-$(call Package/fluxbox/Default)
-  DEPENDS:=fluxbox
-  TITLE:=set fluxbox background colors
-endef
-
-define Package/fbsetbg
-$(call Package/fluxbox/Default)
-  DEPENDS:=fluxbox +x-bkgd-images +eterm
-  TITLE:=set fluxbox background images
-endef
-
 define Build/Configure
        (cd $(PKG_BUILD_DIR)/$(CONFIGURE_PATH); \
                if [ -x $(CONFIGURE_CMD) ]; then \
@@ -74,28 +62,27 @@ endef
 define Package/fluxbox/install
        $(INSTALL_DIR) $(1)/usr/bin
        $(INSTALL_DIR) $(1)/usr/share/fluxbox/styles/
-       $(CP) $(PKG_INSTALL_DIR)/usr/bin/fluxbox $(1)/usr/bin/
-       $(CP) $(PKG_INSTALL_DIR)/usr/share/fluxbox/{init,keys} $(1)/usr/share/fluxbox/
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/fluxbox $(1)/usr/bin/
+       $(CP) $(PKG_INSTALL_DIR)/usr/share/fluxbox/keys $(1)/usr/share/fluxbox/
        $(CP) $(PKG_INSTALL_DIR)/usr/share/fluxbox/styles/* $(1)/usr/share/fluxbox/styles/
+       $(CP) files/init $(1)/usr/share/fluxbox/
        $(CP) files/menu $(1)/usr/share/fluxbox/
 endef
 
 define Package/fbsetbg/install
        $(INSTALL_DIR) $(1)/usr/bin
-       $(CP) $(PKG_INSTALL_DIR)/usr/bin/fbsetbg $(1)/usr/bin/
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/fbsetbg $(1)/usr/bin/
 endef
 
 define Package/fbsetroot/install
        $(INSTALL_DIR) $(1)/usr/bin
-       $(CP) $(PKG_INSTALL_DIR)/usr/bin/fbsetroot $(1)/usr/bin/
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/fbsetroot $(1)/usr/bin/
 endef
 
 define Package/fbrun/install
        $(INSTALL_DIR) $(1)/usr/bin
-       $(CP) $(PKG_INSTALL_DIR)/usr/bin/fbrun $(1)/usr/bin/
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/fbrun $(1)/usr/bin/
 endef
 
 $(eval $(call BuildPackage,fbrun))
-$(eval $(call BuildPackage,fbsetbg))
-$(eval $(call BuildPackage,fbsetroot))
 $(eval $(call BuildPackage,fluxbox))