From 4b662c1dd1f058f7f8f115ae4d41542dca68114c Mon Sep 17 00:00:00 2001
From: John Crispin <john@openwrt.org>
Date: Thu, 20 Sep 2007 22:15:50 +0000
Subject: [PATCH] fixed XOrg lib meta files

SVN-Revision: 8893
---
 XOrg/lib/common.mk   | 27 ++++++++++++++++++++-------
 XOrg/lib/template.mk | 22 ----------------------
 2 files changed, 20 insertions(+), 29 deletions(-)

diff --git a/XOrg/lib/common.mk b/XOrg/lib/common.mk
index 3359041f1..898e01697 100644
--- a/XOrg/lib/common.mk
+++ b/XOrg/lib/common.mk
@@ -10,10 +10,28 @@ PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/lib/
 
 _CATEGORY:=libraries
 _DEPEND+=+xorg-headers-native +util-macros-X11R7.2 
+
 include ../../common.mk
 
+ifeq ("$(PKG_NAME)","libX11-X11R7.2")
+ CONFIGURE_ARGS_XTRA=--without-xcb
+endif
+
+define libX11-X11R7.2/Compile
+	$(MAKE_VARS) \
+		$(MAKE) -C $(PKG_BUILD_DIR)/src/util CFLAGS="" LDFLAGS="" CC="cc" makekeys 
+endef
+
+define libXt-X11R7.2/Compile
+	$(MAKE_VARS) \
+		$(MAKE) -C $(PKG_BUILD_DIR)/util CFLAGS="" LDFLAGS="" CC="cc" 
+endef
+
 define Build/Compile
+	$(call $(PKG_NAME)/Compile)
 	make -C $(PKG_BUILD_DIR)
+	mkdir -p $(PKG_INSTALL_DIR)
+	DESTDIR=$(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install
 endef
 
 define Build/Configure
@@ -36,17 +54,12 @@ endef
 
 define Package/${PKG_NAME}/install
 	$(INSTALL_DIR) $(1)/usr/lib
-	if [ -d $(PKG_BUILD_DIR)/src/.libs/ ]; then \
-		cp -f $(PKG_BUILD_DIR)/src/.libs/lib*so* $(1)/usr/lib ; \
-	fi
-	if [ -d $(PKG_BUILD_DIR)/.libs/ ]; then \
-		cp -f $(PKG_BUILD_DIR)/.libs/lib*so* $(1)/usr/lib ; \
-	fi
+	find $(PKG_INSTALL_DIR)/usr/lib/ -name lib*so* | $(XARGS) -i -t cp -P {} $(1)/usr/lib 
 	$(call $(PKG_NAME)/install,$(1))
 endef
 
 define Build/InstallDev
-	DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/$(SUBPACKAGE)  $(MAKE_FLAGS) install
+	DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install
 	rm -rf $(STAGING_DIR)/usr/lib/*.la
 endef
 
diff --git a/XOrg/lib/template.mk b/XOrg/lib/template.mk
index 672ae73a5..0c1d757b2 100644
--- a/XOrg/lib/template.mk
+++ b/XOrg/lib/template.mk
@@ -7,28 +7,6 @@ PKG_VERSION:=@VER@
 
 _DEPEND:=@DEP@
 
-
 include ../common.mk
 
-ifeq ("$(PKG_NAME)","libX11-X11R7.2")
- #CONFIGURE_ARGS_XTRA=--without-xcb --disable-udc --enable-xcms --disable-xlocale --disable-xkb
- CONFIGURE_ARGS_XTRA=--without-xcb
-define Build/Compile
-	$(MAKE_VARS) \
-		$(MAKE) -C $(PKG_BUILD_DIR)/src/util CFLAGS="" LDFLAGS="" CC="cc" makekeys 
-	$(MAKE_VARS) \
-		$(MAKE) -C $(PKG_BUILD_DIR)/$(MAKE_PATH) \
-		$(MAKE_FLAGS) \
-		all ;
-endef
-endif
-
-ifeq ("$(PKG_NAME)","libXt-X11R7.2")
-define Build/Compile
-	$(MAKE_VARS) \
-	$(MAKE) -C $(PKG_BUILD_DIR)/util CFLAGS="" LDFLAGS="" CC="cc" 
-	make -C $(PKG_BUILD_DIR)
-endef
-endif
-
 $(eval $(call BuildPackage,$(PKG_NAME)))
-- 
2.30.2