Adding missing filename

[openwrt/svn-archive/archive.git] / XOrg / server / xorg-server-X11R7.2 / Makefile

diff --git a/XOrg/server/xorg-server-X11R7.2/Makefile b/XOrg/server/xorg-server-X11R7.2/Makefile
index 44e92ac14922b82dd55b226eb4232f1681d14de0..fcd4949bf71d85fbf7ee7a649d90acc1bf54a759 100644 (file)
--- a/XOrg/server/xorg-server-X11R7.2/Makefile
+++ b/XOrg/server/xorg-server-X11R7.2/Makefile
@@ -74,7 +74,7 @@ DEPENDS_SERVER:=+calibrateproto \
                +libXpm \
                +libnotimpl \
                +Mesa \
-               @TARGET_x86
+               @DISPLAY_SUPPORT
 
 DEPENDS_KDRIVE:=+calibrateproto \
                +compositeproto \
@@ -92,7 +92,14 @@ DEPENDS_KDRIVE:=+calibrateproto \
                +libXrandr \
                +xtrans \
                +libX11 \
-               @TARGET_x86 
+               @DISPLAY_SUPPORT 
+
+
+ifneq ($(CONFIG_TARGET_olpc),)
+  XORG_CONFIG_FILE=xorg-olpc.conf
+else
+  XORG_CONFIG_FILE=xorg.conf
+endif
 
 define Package/xorg-server/config
        config XORG_BUILD_KDRIVE
@@ -138,8 +145,8 @@ endef
 
 define Package/xorg-server/install
        $(INSTALL_DIR) $(1)/usr/bin
-       $(CP) $(PKG_INSTALL_DIR)/usr/bin/Xorg $(1)/usr/bin/
-       cd $(1)/usr/bin; ln -s Xorg X
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/Xorg $(1)/usr/bin/
+       cd $(1)/usr/bin; ln -sf Xorg X
        $(INSTALL_DIR) $(1)/usr/share
        $(CP) $(PKG_INSTALL_DIR)/usr/share/* $(1)/usr/share/
        $(INSTALL_DIR) $(1)/usr/lib/xserver
@@ -152,17 +159,18 @@ define Package/xorg-server/install
        rm -rf $(1)/usr/share/X11 $(1)/usr/lib/X11/xserver      
        $(INSTALL_DIR) $(1)/var/log/
        $(INSTALL_DIR) $(1)/etc/X11/
-       $(CP) files/xorg.conf $(1)/etc/X11/
+       $(CP) files/$(XORG_CONFIG_FILE) $(1)/etc/X11/xorg.conf
 endef
 
 define Packages/xorg-server-config/install
        $(INSTALL_DIR) $(1)/usr/bin
-    $(CP) $(PKG_INSTALL_DIR)/usr/bin/xorgconfig $(1)/usr/bin/
+    $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/xorgconfig $(1)/usr/bin/
 endef
 
 define Build/InstallDev
-       $(CP) $(PKG_INSTALL_DIR)/usr/include/* $(STAGING_DIR)/usr/include/
-       $(CP) $(PKG_BUILD_DIR)/xorg-server.pc $(STAGING_DIR)/usr/lib/pkgconfig/
+       $(INSTALL_DIR) $(1)/usr/include $(1)/usr/lib/pkgconfig
+       $(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/
+       $(CP) $(PKG_BUILD_DIR)/xorg-server.pc $(1)/usr/lib/pkgconfig/
 endef
 
 $(eval $(call BuildPackage,xorg-server))