From: Nicolas Thill <nico@openwrt.org>
Date: Mon, 22 Aug 2005 07:08:31 +0000 (+0000)
Subject: enable options required for libxslt, remove lib searchpath in xml2-config, fix cleaning
X-Git-Tag: reboot~32183
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=ebcfbc5c9abe13e0c5adac3d936d42e18ce3ec47;p=openwrt%2Fstaging%2Fnoltari.git

enable options required for libxslt, remove lib searchpath in xml2-config, fix cleaning

SVN-Revision: 1718
---

diff --git a/openwrt/package/libxml2/Makefile b/openwrt/package/libxml2/Makefile
index a3c6e00f01..97845095ec 100644
--- a/openwrt/package/libxml2/Makefile
+++ b/openwrt/package/libxml2/Makefile
@@ -53,7 +53,7 @@ $(PKG_BUILD_DIR)/.configured:
 			--without-catalog \
 			--without-debug \
 			--without-docbook \
-			--without-html \
+			--with-html \
 			--without-ftp \
 			--without-http \
 			--without-iconv \
@@ -72,9 +72,9 @@ $(PKG_BUILD_DIR)/.configured:
 			--with-tree \
 			--with-valid \
 			--with-writer \
-			--without-xinclude \
-			--without-xpath \
-			--without-xptr \
+			--with-xinclude \
+			--with-xpath \
+			--with-xptr \
 			--with-zlib \
 	);
 	touch $@
@@ -102,13 +102,18 @@ $(STAGING_DIR)/usr/lib/libxml2.so: $(PKG_BUILD_DIR)/.built
 	cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libxml2.{a,so*} $(STAGING_DIR)/usr/lib/
 	mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig
 	cp -fpR $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libxml-2.0.pc $(STAGING_DIR)/usr/lib/pkgconfig/
+	$(SED) 's,-I$${includedir}/libxml2,,g' $(STAGING_DIR)/usr/bin/xml2-config
+	$(SED) 's,-I$${includedir},,g' $(STAGING_DIR)/usr/bin/xml2-config
+	$(SED) 's,-I$(STAGING_DIR)/usr/include,,g' $(STAGING_DIR)/usr/bin/xml2-config
+	$(SED) 's,-L$${libdir},,g' $(STAGING_DIR)/usr/bin/xml2-config
+	$(SED) 's,-L$(STAGING_DIR)/usr/lib,,g' $(STAGING_DIR)/usr/bin/xml2-config
 	touch $@
 
 install-dev: $(STAGING_DIR)/usr/lib/libxml2.so
 
 uninstall-dev:
 	rm -rf \
-		$(STAGING_DIR)/usr/bin/libxml2-config \
+		$(STAGING_DIR)/usr/bin/xml2-config \
 		$(STAGING_DIR)/usr/include/libxml2 \
 		$(STAGING_DIR)/usr/lib/libxml2.{a,so*} \
 		$(STAGING_DIR)/usr/lib/pkgconfig/libxml-2.0.pc \