More X package dependecy fixes.

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

diff --git a/XOrg/app/xdm/Makefile b/XOrg/app/xdm/Makefile
index 86718e6f99c3d907d0dad7052006127c3bb379d7..169a3c1efcf34d32ea335898816c2703b209cb3f 100644 (file)
--- a/XOrg/app/xdm/Makefile
+++ b/XOrg/app/xdm/Makefile
@@ -10,13 +10,13 @@ include $(TOPDIR)/rules.mk
 
 PKG_BASE_NAME:=xdm
 PKG_NAME:=xdm
-PKG_RELEASE:=1
-PKG_VERSION:=X11R7.2-1.1.3
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/app
+PKG_RELEASE:=2
+PKG_VERSION:=1.1.6
+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 (xdm,xinit)
 _DEPEND+=xorg-server-essentials
 endif
@@ -27,13 +27,13 @@ define Package/xdm
   SECTION:=xorg-app
   CATEGORY:=Xorg
   SUBMENU:=app
-  DEPENDS:=${_DEPEND} @TARGET_x86
+  DEPENDS:=${_DEPEND} @DISPLAY_SUPPORT
   TITLE:=xdm
   URL:=http://xorg.freedesktop.org/
 endef
 
 define Build/InstallDev
-       DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)  $(MAKE_FLAGS) install
+       DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install
 endef
 
 ifeq (xdm,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/xdm/install
        $(INSTALL_DIR) $(1)
        $(CP) $(PKG_INSTALL_DIR)/* $(1)