From 64062991586979799cef95de7c6b63ef29fe57ed Mon Sep 17 00:00:00 2001
From: nico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sun, 22 Oct 2006 21:22:13 +0000
Subject: [PATCH] update libtool to 1.5.22, use Build/Configure/Default macro,
 standardize

git-svn-id: svn://svn.openwrt.org/openwrt/packages@5263 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 libs/libtool/Makefile | 63 ++++++++++++++++-----------------------------------
 1 file changed, 19 insertions(+), 44 deletions(-)

diff --git a/libs/libtool/Makefile b/libs/libtool/Makefile
index d3b03f961..9004052b2 100644
--- a/libs/libtool/Makefile
+++ b/libs/libtool/Makefile
@@ -9,15 +9,15 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libtool
-PKG_VERSION:=1.5.14
+PKG_VERSION:=1.5.22
 PKG_RELEASE:=1
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@GNU/libtool
-PKG_MD5SUM:=049bf67de9b0eb75cd943dafe3d749ec
+PKG_MD5SUM:=8e0ac9797b62ba4dcc8a2fb7936412b0
 PKG_CAT:=zcat
 
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(INCLUDE_DIR)/package.mk
@@ -26,60 +26,30 @@ define Package/libltdl
   SECTION:=libs
   CATEGORY:=Libraries
   TITLE:=A generic dynamic object loading library
-  DESCRIPTION:=A generic dynamic object loading library.
   URL:=http://www.gnu.org/software/libtool/
 endef
 
 define Build/Configure
-	(cd $(PKG_BUILD_DIR); rm -rf config.cache; \
-		touch libltdl/configure.ac; \
-		touch libltdl/acinclude.m4; \
-		touch libltdl/aclocal.m4; \
-		touch libltdl/Makefile.in; \
-		touch libltdl/config-h.in; \
-		touch libltdl/configure; \
-		$(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" \
-		./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_NLS) \
-			$(DISABLE_LARGEFILE) \
-			--enable-shared \
-			--enable-static \
+	(cd $(PKG_BUILD_DIR); touch \
+		libltdl/configure.ac \
+		libltdl/acinclude.m4 \
+		libltdl/aclocal.m4 \
+		libltdl/Makefile.in \
+		libltdl/config-h.in \
+		libltdl/configure \
 	);
+	$(call Build/Configure/Default, \
+		--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/libltdl/install
-	install -m0755 -d $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libltdl.so.* $(1)/usr/lib/
-endef
-
 define Build/InstallDev
 	mkdir -p $(STAGING_DIR)/usr/include
 	$(CP) $(PKG_INSTALL_DIR)/usr/include/ltdl.h $(STAGING_DIR)/usr/include/
@@ -93,4 +63,9 @@ define Build/UninstallDev
 		$(STAGING_DIR)/usr/lib/libltdl.{a,so*}
 endef
 
+define Package/libltdl/install
+	install -m0755 -d $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libltdl.so.* $(1)/usr/lib/
+endef
+
 $(eval $(call BuildPackage,libltdl))
-- 
2.11.0