libtwin: General cleanup of the libtwin package makefile

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

diff --git a/libs/db/Makefile b/libs/db/Makefile
index 2079c548b13d10ffdfe4fee4079b9490f745a666..c1e0fd58068faa2e8de6de0c293333da5e3fe947 100644 (file)
--- a/libs/db/Makefile
+++ b/libs/db/Makefile
@@ -1,10 +1,9 @@
 # 
-# 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
 
@@ -18,8 +17,6 @@ PKG_SOURCE_URL:=ftp://ftp.sleepycat.com/releases/ \
        http://downloads.sleepycat.com/
 PKG_MD5SUM:=8b5cff6eb83972afdd8e0b821703c33c
 
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/libdb
@@ -38,8 +35,8 @@ define Build/Configure
        (cd $(PKG_BUILD_DIR)/build_unix; 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" \
+               CPPFLAGS="$(TARGET_CPPFLAGS)" \
+               LDFLAGS="$(TARGET_LDFLAGS)" \
                ../dist/configure \
                        --target=$(GNU_TARGET_NAME) \
                        --host=$(GNU_TARGET_NAME) \
@@ -76,6 +73,8 @@ define Build/Configure
        );
 endef
 
+TARGET_CFLAGS += $(FPIC)
+
 define Build/Compile
        rm -rf $(PKG_INSTALL_DIR)
        mkdir -p $(PKG_INSTALL_DIR)
@@ -95,10 +94,4 @@ define Build/InstallDev
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libdb*.{a,so} $(1)/usr/lib/
 endef
 
-define Build/UninstallDev
-       rm -rf \
-               $(STAGING_DIR)/usr/include/db.h \
-               $(STAGING_DIR)/usr/lib/libdb*.{a,so}
-endef
-
 $(eval $(call BuildPackage,libdb))