rename libgdbm to gdbm (match source name), add libtool fixes, cleanup

SVN-Revision: 8606

diff --git a/libs/gdbm/Makefile b/libs/gdbm/Makefile
new file mode 100644 (file)
index 0000000..97d927f
--- /dev/null
+++ b/libs/gdbm/Makefile
@@ -0,0 +1,64 @@
+# 
+# Copyright (C) 2006 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:=gdbm
+PKG_VERSION:=1.8.3
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=@GNU/gdbm
+PKG_MD5SUM:=1d1b1d5c0245b1c00aff92da751e9aa1
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/libgdbm
+  SECTION:=libs
+  CATEGORY:=Libraries
+  TITLE:=GNU database manager
+  URL:=http://www.gnu.org/software/gdbm/
+endef
+
+CONFIGURE_ARGS += \
+       --enable-shared \
+       --enable-static \
+
+define Build/Configure
+       $(call Build/Configure/Default)
+       $(call libtool_disable_rpath)
+endef
+
+define Build/Compile
+       $(MAKE) -C $(PKG_BUILD_DIR) all
+       $(call libtool_fixup_libdir,$(PKG_INSTALL_DIR))
+       $(MAKE) -C $(PKG_BUILD_DIR) \
+               BINOWN=`id -u` \
+               BINGRP=`id -g` \
+               INSTALL_ROOT="$(PKG_INSTALL_DIR)" \
+               install
+endef
+
+define Build/InstallDev
+       mkdir -p $(STAGING_DIR)/usr/include
+       $(CP) $(PKG_INSTALL_DIR)/usr/include/gdbm.h $(STAGING_DIR)/usr/include/
+       mkdir -p $(STAGING_DIR)/usr/lib
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libgdbm.{a,so*} $(STAGING_DIR)/usr/lib/
+endef
+
+define Build/UninstallDev
+       rm -rf  $(STAGING_DIR)/usr/include/gdbm.h \
+               $(STAGING_DIR)/usr/lib/libgdbm.{a,so*}
+endef
+
+define Package/libgdbm/install
+       $(INSTALL_DIR) $(1)/usr/lib
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libgdbm.so.* $(1)/usr/lib/
+endef
+
+$(eval $(call BuildPackage,libgdbm))

diff --git a/libs/libgdbm/Makefile b/libs/libgdbm/Makefile
deleted file mode 100644 (file)
index 58a84ee..0000000
--- a/libs/libgdbm/Makefile
+++ /dev/null
@@ -1,65 +0,0 @@
-# 
-# Copyright (C) 2006 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:=libgdbm
-PKG_VERSION:=1.8.3
-PKG_RELEASE:=1
-
-PKG_SOURCE:=gdbm-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=@GNU/gdbm
-PKG_MD5SUM:=1d1b1d5c0245b1c00aff92da751e9aa1
-PKG_CAT:=zcat
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/gdbm-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/libgdbm
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=GNU database manager
-  URL:=http://www.gnu.org/software/gdbm/
-endef
-
-define Build/Configure
-       $(call Build/Configure/Default, \
-               --enable-shared \
-               --enable-static \
-       )
-endef
-
-define Build/Compile
-       $(MAKE) -C $(PKG_BUILD_DIR) \
-               BINOWN=`id -u` \
-               BINGRP=`id -g` \
-               INSTALL_ROOT="$(PKG_INSTALL_DIR)" \
-               all install
-endef
-
-define Build/InstallDev
-       mkdir -p $(STAGING_DIR)/usr/include
-       $(CP) $(PKG_INSTALL_DIR)/usr/include/gdbm.h $(STAGING_DIR)/usr/include/
-       mkdir -p $(STAGING_DIR)/usr/lib
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libgdbm.{a,so*} $(STAGING_DIR)/usr/lib/
-endef
-
-define Build/UninstallDev
-       rm -rf \
-               $(STAGING_DIR)/usr/include/gdbm.h \
-               $(STAGING_DIR)/usr/lib/libgdbm.{a,so*}
-endef
-
-define Package/libgdbm/install
-       $(INSTALL_DIR) $(1)/usr/lib
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libgdbm.so.* $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,libgdbm))