[packages/libxapian/Makefile] libstdc++ is now installed in $(TOOLCHAIN_DIR)/usr...

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

diff --git a/libs/libxapian/Makefile b/libs/libxapian/Makefile
index dc1b02df0f0a064fbb475136d6c6589ffab01e0a..38e15d454b86bad29544e8d8d75deae485d8394c 100644 (file)
--- a/libs/libxapian/Makefile
+++ b/libs/libxapian/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2008 OpenWrt.org
+# Copyright (C) 2008-2009 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=xapian-core
 PKG_VERSION:=1.0.7
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://oligarchy.co.uk/xapian/$(PKG_VERSION)
@@ -23,7 +23,6 @@ PKG_INSTALL=1
 EXTRA_LDFLAGS+= \
        -L$(STAGING_DIR)/usr/lib/libintl/lib \
        -L$(STAGING_DIR)/usr/lib/libiconv/lib \
-       -L$(TOOLCHAIN_DIR)/lib
 
 define Package/libxapian
   SECTION:=lib
@@ -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) \
@@ -60,14 +59,14 @@ define Build/InstallDev
 
        #FIXME: Libtool should handle this
        $(SED) \
-               "s,$(STAGING_DIR)/usr/lib/libstdc++,$(TOOLCHAIN_DIR)/lib/libstdc++,g" \
+               "s,$(STAGING_DIR)/usr/lib/libstdc++,$(TOOLCHAIN_DIR)/usr/lib/libstdc++,g" \
                $(1)/usr/lib/libxapian.la
 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 +75,3 @@ define Package/libxapian/install
 endef
 
 $(eval $(call BuildPackage,libxapian))
-
-