fix avahi compile on brcm-2.4

[openwrt/svn-archive/archive.git] / libs / libxslt / Makefile

diff --git a/libs/libxslt/Makefile b/libs/libxslt/Makefile
index 4cdd73eeb9f4153a1fb0d40abab8e861b7b7e485..a6f81c695b1d3510ffe966b96167428337e67439 100644 (file)
--- a/libs/libxslt/Makefile
+++ b/libs/libxslt/Makefile
@@ -9,16 +9,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libxslt
-PKG_VERSION:=1.1.14
+PKG_VERSION:=1.1.24
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://xmlsoft.org/sources/ \
        ftp://fr.rpmfind.net/pub/libxml/
-PKG_MD5SUM:=db71660bb7d01ccd4e6be990af8d813b
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
+PKG_MD5SUM:=e83ec5d27fc4c10c6f612879bea9a153
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -70,27 +67,16 @@ define Build/Compile
 endef
 
 define Build/InstallDev
-       mkdir -p $(1)/usr/bin
-       $(CP) $(PKG_INSTALL_DIR)/usr/bin/xslt-config $(1)/usr/bin/
-       $(CP) $(PKG_INSTALL_DIR)/usr/bin/xsltproc $(1)/usr/bin/
-       mkdir -p $(1)/usr/include
+       $(INSTALL_DIR) $(1)/usr/bin $(1)/usr/include $(1)/usr/lib $(1)/usr/lib/pkgconfig
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/xslt-config $(1)/usr/bin/
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/xsltproc $(1)/usr/bin/
        $(CP) $(PKG_INSTALL_DIR)/usr/include/libxslt $(1)/usr/include/
-       mkdir -p $(1)/usr/lib
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libxslt.{a,so*} $(1)/usr/lib/
-       mkdir -p $(1)/usr/lib/pkgconfig
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libxslt.pc $(1)/usr/lib/pkgconfig/
        $(SED) 's,-I$$$${includedir},,g' $(1)/usr/bin/xslt-config
        $(SED) 's,-L$$$${libdir},,g' $(1)/usr/bin/xslt-config
-       $(SED) 's,-I$(1)/usr/include,,g' $(1)/usr/bin/xslt-config
-       $(SED) 's,-L$(1)/usr/lib,,g' $(1)/usr/bin/xslt-config
-endef
-
-define Build/UninstallDev
-       rm -rf \
-               $(STAGING_DIR)/usr/bin/xslt-config \
-               $(STAGING_DIR)/usr/include/libxslt \
-               $(STAGING_DIR)/usr/lib/libxslt.{a,so*} \
-               $(STAGING_DIR)/usr/lib/pkgconfig/libxslt.pc
+       $(SED) 's,-I$(STAGING_DIR)/usr/include,,g' $(1)/usr/bin/xslt-config
+       $(SED) 's,-L$(STAGING_DIR)/usr/lib,,g' $(1)/usr/bin/xslt-config
 endef
 
 define Package/libxslt/install
@@ -100,7 +86,7 @@ endef
 
 define Package/xsltproc/install
        $(INSTALL_DIR) $(1)/usr/bin
-       $(CP) $(PKG_INSTALL_DIR)/usr/bin/xsltproc $(1)/usr/bin/
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/xsltproc $(1)/usr/bin/
 endef
 
 $(eval $(call BuildPackage,libxslt))