X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/4a42fa23196b16efea78c84202e45f9f4d13c6a8..c3b88d8b5e47898e1941074d62ad7e979b42bad9:/package/libxml2/Makefile?ds=sidebyside

diff --git a/package/libxml2/Makefile b/package/libxml2/Makefile
index a3c6e00f0..c08d5fe8b 100644
--- a/package/libxml2/Makefile
+++ b/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 $@
@@ -89,32 +89,37 @@ $(PKG_BUILD_DIR)/.built:
 
 $(IPKG_LIBXML2):
 	install -m0755 -d $(IDIR_LIBXML2)/usr/lib
-	cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libxml2.so.* $(IDIR_LIBXML2)/usr/lib/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libxml2.so.* $(IDIR_LIBXML2)/usr/lib/
 	$(RSTRIP) $(IDIR_LIBXML2)
 	$(IPKG_BUILD) $(IDIR_LIBXML2) $(PACKAGE_DIR)
 
 $(STAGING_DIR)/usr/lib/libxml2.so: $(PKG_BUILD_DIR)/.built
 	mkdir -p $(STAGING_DIR)/usr/bin
-	cp -fpR $(PKG_INSTALL_DIR)/usr/bin/xml2-config $(STAGING_DIR)/usr/bin/
+	$(CP) $(PKG_INSTALL_DIR)/usr/bin/xml2-config $(STAGING_DIR)/usr/bin/
 	mkdir -p $(STAGING_DIR)/usr/include
-	cp -fpR $(PKG_INSTALL_DIR)/usr/include/libxml2 $(STAGING_DIR)/usr/include/
+	$(CP) $(PKG_INSTALL_DIR)/usr/include/libxml2 $(STAGING_DIR)/usr/include/
 	mkdir -p $(STAGING_DIR)/usr/lib
-	cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libxml2.{a,so*} $(STAGING_DIR)/usr/lib/
+	$(CP) $(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/
+	$(CP) $(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 \
 
-compile: install-dev
-clean: uninstall-dev
+compile-targets: install-dev
+clean-targets: uninstall-dev
 
 mostlyclean:
 	make -C $(PKG_BUILD_DIR) clean