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 b86548286c345df725b17f4a0cb0e758ed94c1e4..b5d296e1ef1a71c5dac57756acb7100c526a3088 100644 (file)
--- a/XOrg/app/fluxbox/Makefile
+++ b/XOrg/app/fluxbox/Makefile
@@ -22,13 +22,24 @@ include $(INCLUDE_DIR)/package.mk
 CONFIGURE_VARS+=LIBS="-nodefaultlibs -luClibc++ -Wl,-Bstatic,-lstdc++,-Bdynamic -lm" \
                CXXLD="$(TARGET_CC)" 
 
-CONFIGURE_ARGS+=--disable-static --disable-xmb
+CONFIGURE_ARGS+=--disable-xmb
 
-define Package/fluxbox
+define Package/fluxbox/Default
   SECTION:=xorg-wm
   CATEGORY:=Xorg
-  DEPENDS:=+xorg-server-X11R7.2-essentials +uclibcxx +xterm @TARGET_x86
+endef
+
+define Package/fluxbox
+$(call Package/fluxbox/Default)
+  DEPENDS:=+xorg-server-essentials +uclibcxx +xterm @DISPLAY_SUPPORT
   TITLE:=fluxbox window manager
+  MENU:=1
+endef
+
+define Package/fbrun
+$(call Package/fluxbox/Default)
+  DEPENDS:=fluxbox
+  TITLE:=fluxbox tool to run applications
 endef
 
 define Build/Configure
@@ -49,9 +60,29 @@ define Build/Compile
 endef
 
 define Package/fluxbox/install
-       $(INSTALL_DIR) $(1)/usr/
-       $(CP) $(PKG_INSTALL_DIR)/usr/bin/ $(1)/usr/
-       $(CP) $(PKG_INSTALL_DIR)/usr/share/ $(1)/usr/
+       $(INSTALL_DIR) $(1)/usr/bin
+       $(INSTALL_DIR) $(1)/usr/share/fluxbox/styles/
+       $(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
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/fbsetbg $(1)/usr/bin/
+endef
+
+define Package/fbsetroot/install
+       $(INSTALL_DIR) $(1)/usr/bin
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/fbsetroot $(1)/usr/bin/
+endef
+
+define Package/fbrun/install
+       $(INSTALL_DIR) $(1)/usr/bin
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/fbrun $(1)/usr/bin/
 endef
 
+$(eval $(call BuildPackage,fbrun))
 $(eval $(call BuildPackage,fluxbox))