[packages] ossp-js: don't autoreconf

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

diff --git a/libs/libxapian/Makefile b/libs/libxapian/Makefile
index dc1b02df0f0a064fbb475136d6c6589ffab01e0a..82b3cecd28271ad454cd301a4e7c9352fc11c916 100644 (file)
--- a/libs/libxapian/Makefile
+++ b/libs/libxapian/Makefile
@@ -1,36 +1,35 @@
 #
-# Copyright (C) 2008 OpenWrt.org
+# Copyright (C) 2008-2010 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:=xapian-core
 PKG_VERSION:=1.0.7
-PKG_RELEASE:=1
+PKG_RELEASE:=3
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://oligarchy.co.uk/xapian/$(PKG_VERSION)
+PKG_MD5SUM:=b4acff50028120852d4a8d943065f6d2
+
 PKG_FIXUP:=libtool
+PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
-PKG_INSTALL=1
-
-EXTRA_LDFLAGS+= \
+TARGET_LDFLAGS+= \
        -L$(STAGING_DIR)/usr/lib/libintl/lib \
        -L$(STAGING_DIR)/usr/lib/libiconv/lib \
-       -L$(TOOLCHAIN_DIR)/lib
 
 define Package/libxapian
-  SECTION:=lib
+  SECTION:=libs
   CATEGORY:=Libraries
   TITLE:=xapian
   URL:=http://xapian.org
-  DEPENDS:=+libstdcpp
+  DEPENDS:=+libstdcpp +zlib
 endef
 
 define Build/InstallDev
@@ -49,8 +48,8 @@ define Build/InstallDev
                $(1)/usr/include/xapian
 
        $(INSTALL_DIR) $(1)/usr/lib/
-       $(INSTALL_DATA) \
-               $(PKG_INSTALL_DIR)/usr/lib/*.{so*,la} \
+       $(CP) \
+               $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a,la} \
                $(1)/usr/lib/
        $(INSTALL_DIR) $(2)/bin
        $(INSTALL_BIN) \
@@ -59,15 +58,21 @@ define Build/InstallDev
        $(SED) 's,prefix=",prefix="$(STAGING_DIR),g' $(2)/bin/xapian-config
 
        #FIXME: Libtool should handle this
-       $(SED) \
+       if [ -f $(TOOLCHAIN_DIR)/usr/lib/libstdc++.la ]; then \
+         $(SED) \
+               "s,$(STAGING_DIR)/usr/lib/libstdc++,$(TOOLCHAIN_DIR)/usr/lib/libstdc++,g" \
+               $(1)/usr/lib/libxapian.la ; \
+       else \
+         $(SED) \
                "s,$(STAGING_DIR)/usr/lib/libstdc++,$(TOOLCHAIN_DIR)/lib/libstdc++,g" \
-               $(1)/usr/lib/libxapian.la
+               $(1)/usr/lib/libxapian.la ; \
+       fi
 endef
 
 define Package/libxapian/install
        $(INSTALL_DIR) $(1)/usr/lib/
-       $(INSTALL_DATA) \
-               $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a} \
+       $(CP) \
+               $(PKG_INSTALL_DIR)/usr/lib/*.so* \
                $(1)/usr/lib
        $(INSTALL_DIR) $(1)/usr/bin/
        $(INSTALL_BIN) \
@@ -76,5 +81,3 @@ define Package/libxapian/install
 endef
 
 $(eval $(call BuildPackage,libxapian))
-
-