remove ref to host directories in config scripts.

[openwrt.git] / openwrt / package / sqlite / Makefile

diff --git a/openwrt/package/sqlite/Makefile b/openwrt/package/sqlite/Makefile
index b85d894..003f478 100644 (file)
--- a/openwrt/package/sqlite/Makefile
+++ b/openwrt/package/sqlite/Makefile
@@ -3,9 +3,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=sqlite
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=sqlite

-PKG_VERSION:=3.2.8
+PKG_VERSION:=3.3.3

 PKG_RELEASE:=1
 PKG_RELEASE:=1

-PKG_MD5SUM:=9f2c014aaa46565b8163e047166a5686
+PKG_MD5SUM:=eb5d9d7e7853b3af78e767d709b7fced

 
 PKG_SOURCE_URL:=http://www.sqlite.org/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 
 PKG_SOURCE_URL:=http://www.sqlite.org/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz


@@ -67,23 +67,25 @@ $(PKG_BUILD_DIR)/.built:
 
 $(IPKG_LIBSQLITE):
        install -d -m0755 $(IDIR_LIBSQLITE)/usr/lib
 
 $(IPKG_LIBSQLITE):
        install -d -m0755 $(IDIR_LIBSQLITE)/usr/lib

-       cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libsqlite3.so.* $(IDIR_LIBSQLITE)/usr/lib/
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libsqlite3.so.* $(IDIR_LIBSQLITE)/usr/lib/

        $(RSTRIP) $(IDIR_LIBSQLITE)
        $(IPKG_BUILD) $(IDIR_LIBSQLITE) $(PACKAGE_DIR)
 
 $(IPKG_SQLITE_CLI):
        install -d -m0755 $(IDIR_SQLITE_CLI)/usr/bin
        $(RSTRIP) $(IDIR_LIBSQLITE)
        $(IPKG_BUILD) $(IDIR_LIBSQLITE) $(PACKAGE_DIR)
 
 $(IPKG_SQLITE_CLI):
        install -d -m0755 $(IDIR_SQLITE_CLI)/usr/bin

-       cp -fpR $(PKG_INSTALL_DIR)/usr/bin/sqlite3 $(IDIR_SQLITE_CLI)/usr/bin/
+       $(CP) $(PKG_INSTALL_DIR)/usr/bin/sqlite3 $(IDIR_SQLITE_CLI)/usr/bin/

        $(RSTRIP) $(IDIR_SQLITE_CLI)
        $(IPKG_BUILD) $(IDIR_SQLITE_CLI) $(PACKAGE_DIR)
 
 $(STAGING_DIR)/usr/lib/libsqlite3.so: $(PKG_BUILD_DIR)/.built
        mkdir -p $(STAGING_DIR)/usr/include
        $(RSTRIP) $(IDIR_SQLITE_CLI)
        $(IPKG_BUILD) $(IDIR_SQLITE_CLI) $(PACKAGE_DIR)
 
 $(STAGING_DIR)/usr/lib/libsqlite3.so: $(PKG_BUILD_DIR)/.built
        mkdir -p $(STAGING_DIR)/usr/include

-       cp -fpR $(PKG_INSTALL_DIR)/usr/include/sqlite3.h $(STAGING_DIR)/usr/include/
+       $(CP) $(PKG_INSTALL_DIR)/usr/include/sqlite3.h $(STAGING_DIR)/usr/include/

        mkdir -p $(STAGING_DIR)/usr/lib
        mkdir -p $(STAGING_DIR)/usr/lib

-       cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libsqlite3.{a,so*} $(STAGING_DIR)/usr/lib/
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libsqlite3.{a,so*} $(STAGING_DIR)/usr/lib/

        mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig
        mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig

-       cp -fpR $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/sqlite3.pc $(STAGING_DIR)/usr/lib/pkgconfig/
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/sqlite3.pc $(STAGING_DIR)/usr/lib/pkgconfig/
+       $(SED) 's,-I$${includedir},,g' $(STAGING_DIR)/usr/lib/pkgconfig/sqlite3.pc
+       $(SED) 's,-L$${libdir},,g' $(STAGING_DIR)/usr/lib/pkgconfig/sqlite3.pc

        touch $@
 
 install-dev: $(STAGING_DIR)/usr/lib/libsqlite3.so
        touch $@
 
 install-dev: $(STAGING_DIR)/usr/lib/libsqlite3.so