fix various makefile errors (#1236)

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

diff --git a/libs/sqlite2/Makefile b/libs/sqlite2/Makefile
index a8d8fce3e0ceb218c7b494c68f24b6442e188b26..432e90b93de63a219d5de52d303d027ff8c93125 100644 (file)
--- a/libs/sqlite2/Makefile
+++ b/libs/sqlite2/Makefile
@@ -12,50 +12,54 @@ PKG_NAME:=sqlite2
 PKG_VERSION:=2.8.17
 PKG_RELEASE:=1
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/sqlite-$(PKG_VERSION)
 PKG_SOURCE:=sqlite-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.sqlite.org/
 PKG_MD5SUM:=838dbac20b56d2c4292e98848505a05b
 PKG_CAT:=zcat
 
+PKG_BUILD_DIR:=$(BUILD_DIR)/sqlite-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-PKG_BUILDDEP:=ncurses readline
+
+PKG_BUILDDEP:=libncurses libreadline
 
 include $(INCLUDE_DIR)/package.mk
 
+define Package/sqlite2/Default
+  TITLE:=SQLite (v2.x) database engine
+  DESCRIPTION:=\
+       SQLite is a small C library that implements a self-contained, embeddable, \\\
+       zero-configuration SQL database engine.
+  URL:=http://www.sqlite.org/
+endef
+
 define Package/libsqlite2
+  $(call Package/sqlite2/Default)
   SECTION:=libs
   CATEGORY:=Libraries
-  TITLE:=Self-contained SQL database engine
-  DESCRIPTION:=Self-contained, embeddable, zero-configuration SQL database engine.\\\
-    SQLite is a small C library that implements a self-contained, embeddable, \\\
-    zero-configuration SQL database engine.\\\
-    \\\
-    This package contains the shared library, needed by other programs.
-  URL:=http://www.sqlite.org/
+  TITLE+= (library)
+  DESCRIPTION+=\\\
+       \\\
+       This package contains the SQLite (v2.x) shared library, used by other programs.
 endef
 
 define Package/sqlite2-cli
-  SECTION:=libs
-  CATEGORY:=Libraries
-  DEPENDS:=libsqlite2 +libncurses +libreadline
-  TITLE:=Command line interface for SQLite
-  DESCRIPTION:=Command line interface for SQLite.\\\
-    SQLite is a small C library that implements a self-contained, embeddable, \\\
-    zero-configuration SQL database engine.\\\
-    \\\
-    This package contains a terminal-based front-end to the SQLite library \\\
-    that can evaluate queries interactively and display the results in \\\
-    multiple formats.
-  URL:=http://www.sqlite.org/
+  $(call Package/sqlite2/Default)
+  SECTION:=utils
+  CATEGORY:=Utilities
+  DEPENDS:=+libsqlite2 +libncurses +libreadline
+  TITLE+= (cli)
+  DESCRIPTION+=\\\
+       \\\
+       This package contains a terminal-based front-end to the SQLite (v2.x) library \\\
+       that can evaluate queries interactively and display the results in \\\
+       multiple formats.
 endef
 
 define Build/Configure
-       (cd $(PKG_BUILD_DIR); rm -f config.cache; \
-               $(TARGET_CONFIGURE_OPTS) \
-               CFLAGS="$(TARGET_CFLAGS)" \
-               CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
-               LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
+       $(call Build/Configure/Default, \
+               --enable-shared \
+               --enable-static \
+               , \
                config_BUILD_CC="$(HOSTCC)" \
                config_BUILD_CFLAGS="-O2" \
                config_TARGET_CC="$(TARGET_CC)" \
@@ -63,48 +67,15 @@ define Build/Configure
                config_TARGET_READLINE_INC="-I$(STAGING_DIR)/usr/include" \
                config_TARGET_READLINE_LIBS="-L$(STAGING_DIR)/usr/lib -lreadline -lncurses" \
                config_TARGET_TCL_INC="-DNO_TCL=1" \
-               ./configure \
-                       --target=$(GNU_TARGET_NAME) \
-                       --host=$(GNU_TARGET_NAME) \
-                       --build=$(GNU_HOST_NAME) \
-                       --program-prefix="" \
-                       --program-suffix="" \
-                       --prefix=/usr \
-                       --exec-prefix=/usr \
-                       --bindir=/usr/bin \
-                       --datadir=/usr/share \
-                       --includedir=/usr/include \
-                       --infodir=/usr/share/info \
-                       --libdir=/usr/lib \
-                       --libexecdir=/usr/lib \
-                       --localstatedir=/var \
-                       --mandir=/usr/share/man \
-                       --sbindir=/usr/sbin \
-                       --sysconfdir=/etc \
-                       $(DISABLE_LARGEFILE) \
-                       --enable-shared \
-                       --enable-static \
-       );
+       )
 endef
 
 define Build/Compile
-       rm -rf $(PKG_INSTALL_DIR)
-       mkdir -p $(PKG_INSTALL_DIR)
        $(MAKE) -C $(PKG_BUILD_DIR) \
                DESTDIR="$(PKG_INSTALL_DIR)" \
                all install
 endef
 
-define Package/libsqlite2/install
-       install -d -m0755 $(1)/usr/lib
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libsqlite.so.* $(1)/usr/lib/
-endef
-
-define Package/sqlite2-cli/install
-       install -d -m0755 $(1)/usr/bin
-       $(CP) $(PKG_INSTALL_DIR)/usr/bin/sqlite $(1)/usr/bin/
-endef
-
 define Build/InstallDev
        mkdir -p $(STAGING_DIR)/usr/include
        $(CP) $(PKG_INSTALL_DIR)/usr/include/sqlite.h $(STAGING_DIR)/usr/include/
@@ -112,14 +83,25 @@ define Build/InstallDev
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libsqlite.{a,so*} $(STAGING_DIR)/usr/lib/
        mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/sqlite.pc $(STAGING_DIR)/usr/lib/pkgconfig/
+       $(SED) 's,-I$$$${includedir},,g' $(STAGING_DIR)/usr/lib/pkgconfig/sqlite.pc
+       $(SED) 's,-L$$$${libdir},,g' $(STAGING_DIR)/usr/lib/pkgconfig/sqlite.pc
 endef
 
 define Build/UninstallDev
-       rm -rf \
-               $(STAGING_DIR)/usr/include/sqlite.h \
+       rm -rf  $(STAGING_DIR)/usr/include/sqlite.h \
                $(STAGING_DIR)/usr/lib/libsqlite.{a,so*} \
                $(STAGING_DIR)/usr/lib/pkgconfig/sqlite.pc
 endef
 
+define Package/libsqlite2/install
+       $(INSTALL_DIR) $(1)/usr/lib
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libsqlite.so.* $(1)/usr/lib/
+endef
+
+define Package/sqlite2-cli/install
+       $(INSTALL_DIR) $(1)/usr/bin
+       $(CP) $(PKG_INSTALL_DIR)/usr/bin/sqlite $(1)/usr/bin/
+endef
+
 $(eval $(call BuildPackage,libsqlite2))
 $(eval $(call BuildPackage,sqlite2-cli))