More X package dependecy fixes.

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

diff --git a/XOrg/app/xsetroot/Makefile b/XOrg/app/xsetroot/Makefile
index e8b8b4e68b4983f22a18eb29a5ed2a11dfa8c193..bad5149b10088a97d4ab5420b6c27bcc74bd8353 100644 (file)
--- a/XOrg/app/xsetroot/Makefile
+++ b/XOrg/app/xsetroot/Makefile
@@ -10,13 +10,13 @@ include $(TOPDIR)/rules.mk
 
 PKG_BASE_NAME:=xsetroot
 PKG_NAME:=xsetroot
-PKG_RELEASE:=1
-PKG_VERSION:=X11R7.0-1.0.1
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/app
+PKG_RELEASE:=2
+PKG_VERSION:=1.0.2
+PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/app
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
 
-_DEPEND:=
+_DEPEND:= +libX11
 ifneq (xsetroot,xinit)
 _DEPEND+=xorg-server-essentials
 endif
@@ -33,7 +33,7 @@ define Package/xsetroot
 endef
 
 define Build/InstallDev
-       DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR)  $(MAKE_FLAGS) install
+       DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install
 endef
 
 ifeq (xsetroot,xdm)
@@ -47,18 +47,6 @@ define Build/Compile
        make -C $(PKG_BUILD_DIR) DESTDIR=$(PKG_INSTALL_DIR) install
 endef
 
-define Build/Configure
-       (cd $(PKG_BUILD_DIR)/$(CONFIGURE_PATH); \
-       if [ -x $(CONFIGURE_CMD) ]; then \
-               $(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/ && \
-               $(CONFIGURE_VARS) \
-               $(CONFIGURE_CMD) \
-               $(CONFIGURE_ARGS_XTRA) \
-               $(CONFIGURE_ARGS) ;\
-       fi \
-       )
-endef
-
 define Package/xsetroot/install
        $(INSTALL_DIR) $(1)
        $(CP) $(PKG_INSTALL_DIR)/* $(1)
@@ -67,7 +55,7 @@ endef
 
 define Package/xinit/install
        $(INSTALL_DIR) $(1)/usr/bin
-       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/xinit $(1)/usr/bin/xinit
+       $(CP) $(PKG_INSTALL_DIR)/usr/bin/xinit $(1)/usr/bin/xinit
        cd $(1)/usr/bin/; ln -s xinit startx
 endef