X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/1ef279360967f92507bee7e6982e6e79b6ca4a28..4ffcc29e4636d91aab6775ce26885c6065cf1040:/package/libtool/Makefile

diff --git a/package/libtool/Makefile b/package/libtool/Makefile
index a6710368d..2342fb0b0 100644
--- a/package/libtool/Makefile
+++ b/package/libtool/Makefile
@@ -7,9 +7,10 @@ PKG_VERSION:=1.5.14
 PKG_RELEASE:=1
 PKG_MD5SUM:=049bf67de9b0eb75cd943dafe3d749ec
 
-PKG_SOURCE_URL:= \
-	http://ftp.gnu.org/gnu/libtool/ \
-	http://nthill.free.fr/openwrt/sources/$(PKG_NAME)/
+PKG_SOURCE_URL:=http://ftp.gnu.org/gnu/libtool/ \
+	ftp://ftp.belnet.be/mirror/ftp.gnu.org/gnu/libtool/ \
+	ftp://ftp.mirror.nl/pub/mirror/gnu/libtool/ \
+	http://mirror.switch.ch/ftp/mirror/gnu/libtool/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_CAT:=zcat
 
@@ -47,15 +48,15 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
 		  --enable-shared \
 		  --enable-static \
 	);
-	touch $(PKG_BUILD_DIR)/.configured
+	touch $@
 
 $(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured
-	$(MAKE) -C $(PKG_BUILD_DIR)
+	rm -rf $(PKG_INSTALL_DIR)
 	mkdir -p $(PKG_INSTALL_DIR)
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
-		install
-	touch $(PKG_BUILD_DIR)/.built
+		all install
+	touch $@
 
 $(IPKG_LIBLTDL):
 	install -m0755 -d $(IDIR_LIBLTDL)/usr/lib
@@ -68,12 +69,14 @@ $(STAGING_DIR)/usr/lib/libltdl.so: $(PKG_BUILD_DIR)/.built
 	cp -fpR $(PKG_INSTALL_DIR)/usr/include/ltdl.h $(STAGING_DIR)/usr/include/
 	mkdir -p $(I_LIBLTDL_DEV)/usr/lib
 	cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libltdl.{a,so*} $(STAGING_DIR)/usr/lib/
+	touch $@
 
 install-dev: $(STAGING_DIR)/usr/lib/libltdl.so
 
 uninstall-dev:
-	rm -rf $(STAGING_DIR)/usr/include/ltdl*
-	rm -rf $(STAGING_DIR)/usr/lib/libltdl.{a,so*}
+	rm -rf \
+		$(STAGING_DIR)/usr/include/ltdl.h \
+		$(STAGING_DIR)/usr/lib/libltdl.{a,so*} \
 
 compile: install-dev
 clean: uninstall-dev