-define Package/xorg-server/install
- $(INSTALL_DIR) $(1)/usr/bin $(1)/usr/lib $(1)/etc/init.d $(1)/etc/config
- #$(CP) $(PKG_INSTALL_DIR)/usr/bin/$(X_BIN_FILE) $(1)/usr/bin/
- $(CP) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/
- $(CP) ./files/x.init $(1)/etc/init.d/x11
- $(if $(X_CONFIG),$(CP) ./files/config/$(X_CONFIG) $(1)/etc/config/x11)
- cd $(1)/usr/bin; ln -sf $(X_BIN_FILE) X
- $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/
-endef
-
-#define Package/xorg-server/install
-# $(INSTALL_DIR) $(1)/usr/bin
-# $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/$(XORG_BIN_FILE) $(1)/usr/bin/
-# cd $(1)/usr/bin; ln -sf $(XORG_BIN_FILE) X
-# $(INSTALL_DIR) $(1)/usr/share
-# $(CP) $(PKG_INSTALL_DIR)/usr/share/* $(1)/usr/share/
-# $(INSTALL_DIR) $(1)/usr/lib/xserver
-# $(CP) $(PKG_INSTALL_DIR)/usr/lib/xserver/* $(1)/usr/lib/xserver
-# $(INSTALL_DIR) $(1)/usr/lib/xorg/
-# $(CP) -r $(PKG_INSTALL_DIR)/usr/lib/xorg/* $(1)/usr/lib/xorg/
-# find $(1)/usr/lib/xorg/ -name *.la | xargs rm -rf
-# $(INSTALL_DIR) $(1)/usr/lib/X11/
-# $(CP) -r $(PKG_INSTALL_DIR)/usr/lib/X11/* $(1)/usr/lib/X11/
-# rm -rf $(1)/usr/share/X11 $(1)/usr/lib/X11/xserver
-# $(INSTALL_DIR) $(1)/var/log/
-# $(INSTALL_DIR) $(1)/etc/X11/
-# $(CP) files/$(XORG_CONFIG_FILE) $(1)/etc/X11/xorg.conf
-#endef
+define Package/xserver-common/install
+ $(INSTALL_DIR) $(1)/etc/{init.d,config}
+ $(INSTALL_DATA) \
+ ./files/x.init \
+ $(1)/etc/init.d/x11
+ $(if $(X_CONFIG), \
+ $(INSTALL_DATA) \
+ ./files/config/$(X_CONFIG) \
+ $(1)/etc/config/x11 \
+ )
+
+ $(INSTALL_DIR) $(1)/usr/lib/xorg
+ $(INSTALL_DATA) \
+ $(PKG_INSTALL_DIR)/usr/lib/xorg/protocol.txt \
+ $(1)/usr/lib/xorg/
+endef
+
+define Package/xserver-xfdev/install
+ $(INSTALL_DIR) $(1)/usr/bin
+ $(INSTALL_BIN) \
+ $(1)/usr/bin/Xfbdev \
+ $(PKG_INSTALL_DIR)/usr/bin/Xfbdev
+endef
+
+define Package/xserver-xvesa/install
+ $(INSTALL_DIR) $(1)/usr/bin
+ $(INSTALL_BIN) \
+ $(1)/usr/bin/Xvesa \
+ $(PKG_INSTALL_DIR)/usr/bin/Xvesa
+endef
+
+define Package/xserver-xorg/install
+ $(INSTALL_DIR) $(1)/usr/bin
+ $(INSTALL_BIN) \
+ $(PKG_INSTALL_DIR)/usr/bin/Xorg \
+ $(1)/usr/bin/
+
+ $(INSTALL_DIR) $(1)/usr/lib/X11
+ $(INSTALL_DATA) \
+ $(PKG_INSTALL_DIR)/usr/lib/X11/* \
+ $(1)/usr/lib/X11/
+
+ $(INSTALL_DIR) $(1)/usr/lib/xorg/modules/{extensions,fonts,linux,multimedia}
+ $(INSTALL_DATA) \
+ $(PKG_INSTALL_DIR)/usr/lib/xorg/modules/*.so \
+ $(1)/usr/lib/xorg/modules/
+
+ $(for dir,extensions fonts linux multimedia, \
+ $(INSTALL_DATA) \
+ $(PKG_INSTALL_DIR)/usr/lib/xorg/modules/$(d)/*.so \
+ $(1)/usr/lib/xorg/modules/$(d) \
+ )
+endef