[packages] libxslt: update to v1.1.26, cleanup

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

diff --git a/libs/libxslt/Makefile b/libs/libxslt/Makefile
index 12603fd24dd205e99f9d944f053b5d17966507e2..4dce40224d073f8096b4730b7b9b458ff81ec524 100644 (file)
--- a/libs/libxslt/Makefile
+++ b/libs/libxslt/Makefile
@@ -1,27 +1,26 @@
 #
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2009 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id$
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libxslt
-PKG_VERSION:=1.1.24
+PKG_VERSION:=1.1.26
 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:=e83ec5d27fc4c10c6f612879bea9a153
+PKG_MD5SUM:=e61d0364a30146aaa3001296f853b2b9
+
 PKG_FIXUP:=libtool
+PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
-PKG_INSTALL=1
-
 define Package/libxslt
   SECTION:=libs
   CATEGORY:=Libraries
@@ -46,27 +45,27 @@ define Package/xsltproc/description
        XSLT XML transformation utility
 endef
 
-define Build/Configure
-       $(call Build/Configure/Default, \
-               --enable-shared \
-               --enable-static \
-               --without-python \
-               --without-crypto \
-               --without-debug \
-               --without-mem-debug \
-               --without-debugger \
-       )
-endef
+CONFIGURE_ARGS+= \
+       --enable-shared \
+       --enable-static \
+       --without-python \
+       --without-crypto \
+       --without-debug \
+       --without-mem-debug \
+       --without-debugger \
 
 TARGET_CFLAGS += $(FPIC)
 
 define Build/InstallDev
-       $(INSTALL_DIR) $(2)/bin $(1)/usr/include/libxslt $(1)/usr/lib \
+       $(INSTALL_DIR) $(1)/usr/bin $(2)/bin $(1)/usr/include/libxslt $(1)/usr/lib \
                $(1)/usr/lib/pkgconfig $(2)/share/aclocal
 
        $(INSTALL_BIN) \
                $(PKG_INSTALL_DIR)/usr/bin/xslt-config \
                $(2)/bin/
+
+       ln -sf $(STAGING_DIR)/host/bin/xslt-config $(1)/usr/bin/xslt-config
+
        $(SED) \
                's,^\(prefix\|exec_prefix\)=.*,\1=$(STAGING_DIR)/usr,g' \
                $(2)/bin/xslt-config
@@ -75,8 +74,8 @@ define Build/InstallDev
                $(PKG_INSTALL_DIR)/usr/include/libxslt/* \
                $(1)/usr/include/libxslt/
 
-       $(INSTALL_DATA) \
-               $(PKG_INSTALL_DIR)/usr/lib/libxslt.{la,so*} \
+       $(CP) \
+               $(PKG_INSTALL_DIR)/usr/lib/libxslt.{la,a,so*} \
                $(1)/usr/lib/
 
        $(INSTALL_DATA) \
@@ -90,7 +89,7 @@ endef
 
 define Package/libxslt/install
        $(INSTALL_DIR) $(1)/usr/lib
-       $(INSTALL_DATA) \
+       $(CP) \
                $(PKG_INSTALL_DIR)/usr/lib/libxslt.so.* \
                $(1)/usr/lib/
 endef