From dc41c46ef4e4875a01b7a53687902f8163d9f26f Mon Sep 17 00:00:00 2001
From: Florian Fainelli <florian@openwrt.org>
Date: Sat, 31 Jul 2010 22:33:35 +0000
Subject: [PATCH] [package] add xkeyboard-config and install shared libX11
 directory correctly

SVN-Revision: 22448
---
 Xorg/xorg/data/xkeyboard-config/Makefile | 38 ++++++++++++++++++++++++
 Xorg/xorg/lib/libX11/Makefile            |  4 +++
 2 files changed, 42 insertions(+)
 create mode 100644 Xorg/xorg/data/xkeyboard-config/Makefile

diff --git a/Xorg/xorg/data/xkeyboard-config/Makefile b/Xorg/xorg/data/xkeyboard-config/Makefile
new file mode 100644
index 0000000000..be355b7850
--- /dev/null
+++ b/Xorg/xorg/data/xkeyboard-config/Makefile
@@ -0,0 +1,38 @@
+#
+# Copyright (C) 2008-2010 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=xkeyboard-config
+PKG_VERSION:=1.7
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_SOURCE_URL:=http://xlibs.freedesktop.org/xkbdesc/
+PKG_INSTALL:=1
+
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/xkeyboard-config
+  SECTION:=xorg-data
+  CATEGORY:=Xorg
+  SUBMENU:=data
+  TITLE:=xkeyboard-config
+  URL:=http://freedesktop.org/wiki/Software/XKeyboardConfig
+endef
+
+define Build/Configure
+	$(call Build/Configure/Default)
+endef
+define Package/xkeyboard-config/install
+  $(INSTALL_DIR) $(1)/usr/share/X11/xkb
+    $(CP) -v $(PKG_INSTALL_DIR)/usr/share/X11/xkb \
+      $(1)/usr/share/X11/
+endef
+
+$(eval $(call BuildPackage,xkeyboard-config))
diff --git a/Xorg/xorg/lib/libX11/Makefile b/Xorg/xorg/lib/libX11/Makefile
index 2cba49e5db..9432953a4d 100644
--- a/Xorg/xorg/lib/libX11/Makefile
+++ b/Xorg/xorg/lib/libX11/Makefile
@@ -74,9 +74,13 @@ endef
 
 define Package/libX11/install
 	$(INSTALL_DIR) $(1)/usr/lib
+	$(INSTALL_DIR) $(1)/usr/share/X11
 	$(CP) \
 		$(PKG_INSTALL_DIR)/usr/lib/*.so* \
 		$(1)/usr/lib/
+	$(CP)  \
+		$(PKG_INSTALL_DIR)/usr/share/X11/* \
+		$(1)/usr/share/X11
 endef
 
 $(eval $(call Feature,libX11))
-- 
2.30.2