X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=package%2Flibtool%2FMakefile;h=2960e5319c77589ddb82bb86d4354d1296c437dc;hb=c8564630f3b5e5023dbe595e8056f7a3c100b495;hp=1aad641986e6960910edc38a99d08519ed196b84;hpb=19efc9d28e32cc50635fb89d5f140876f63709d8;p=openwrt-10.03%2F.git

diff --git a/package/libtool/Makefile b/package/libtool/Makefile
index 1aad64198..2960e5319 100644
--- a/package/libtool/Makefile
+++ b/package/libtool/Makefile
@@ -4,23 +4,23 @@
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id$
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libtool
-PKG_VERSION:=1.5.22
+PKG_VERSION:=2.4
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@GNU/libtool
-PKG_MD5SUM:=8e0ac9797b62ba4dcc8a2fb7936412b0
+PKG_MD5SUM:=b32b04148ecdd7344abc6fe8bd1bb021
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PATCH_DIR:=$(TOPDIR)/tools/libtool/patches
 
 include $(INCLUDE_DIR)/package.mk
 
 CONFIGURE_PREFIX=$(STAGING_DIR)/host
+export GLOBAL_LIBDIR=$(STAGING_DIR)/usr/lib
 
 define Package/libltdl
   SECTION:=libs
@@ -31,11 +31,14 @@ endef
 
 define Build/InstallDev
 	$(MAKE) -C $(PKG_BUILD_DIR) \
+		bindir="$(2)/bin" \
+		datadir="$(2)/share" \
 		prefix="$(2)" \
 		exec_prefix="$(2)" \
 		install
-	$(INSTALL_DIR) $(1)/lib
-	mv $(2)/lib/* $(1)/lib/
+	$(INSTALL_DIR) $(1)/usr/lib $(1)/usr/include
+	mv $(2)/lib/* $(1)/usr/lib/
+	mv $(2)/include/* $(1)/usr/include/
 endef
 
 define Package/libltdl/install