X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/f89e84a2a29a5d5d9986a4f0c93a9d21a633426c..d235dc570be398619b14ba233d72b5be81adc82f:/package/tinc/Makefile

diff --git a/package/tinc/Makefile b/package/tinc/Makefile
index bc64cc0e3..912fcc3db 100644
--- a/package/tinc/Makefile
+++ b/package/tinc/Makefile
@@ -7,7 +7,9 @@ PKG_VERSION:=1.0.4
 PKG_RELEASE:=1
 PKG_MD5SUM:=63887373dd763f8d90cecc5a3616c363
 
-PKG_SOURCE_URL:=http://www.tinc-vpn.org/packages
+PKG_SOURCE_URL:=http://www.tinc-vpn.org/packages \
+	http://ftp.yi.se/pub/tinc/ \
+	http://www.mirrors.wiretapped.net/security/network-security/tinc/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_CAT:=zcat
 
@@ -18,7 +20,7 @@ include $(TOPDIR)/package/rules.mk
 
 $(eval $(call PKG_template,TINC,tinc,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 
-$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
+$(PKG_BUILD_DIR)/.configured:
 	(cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \
 		$(TARGET_CONFIGURE_OPTS) \
 		CFLAGS="$(TARGET_CFLAGS)" \
@@ -47,22 +49,21 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
 		  --with-kernel=$(LINUX_DIR) \
 		  --with-zlib=$(STAGING_DIR)/usr/ \
 	);
-	touch $(PKG_BUILD_DIR)/.configured
+	touch $@
 
-$(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured
+$(PKG_BUILD_DIR)/.built:
+	rm -rf $(PKG_INSTALL_DIR)
+	mkdir -p $(PKG_INSTALL_DIR)
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		CC=$(TARGET_CC) \
 		CFLAGS="$(TARGET_CFLAGS)" \
-		all
-	mkdir -p $(PKG_INSTALL_DIR)
-	$(MAKE) -C $(PKG_BUILD_DIR) \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
-		install
-	touch $(PKG_BUILD_DIR)/.built
+		all install
+	touch $@
 
 $(IPKG_TINC):
 	install -m0755 -d $(IDIR_TINC)/usr/sbin
-	cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/tincd $(IDIR_TINC)/usr/sbin/
+	$(CP) $(PKG_INSTALL_DIR)/usr/sbin/tincd $(IDIR_TINC)/usr/sbin/
 	$(RSTRIP) $(IDIR_TINC)
 	$(IPKG_BUILD) $(IDIR_TINC) $(PACKAGE_DIR)