remove backup/restore for now. will add proper scripts with webif integration later...

[openwrt.git] / openwrt / package / tinc / Makefile

diff --git a/openwrt/package/tinc/Makefile b/openwrt/package/tinc/Makefile
index bc64cc0..769be77 100644 (file)
--- a/openwrt/package/tinc/Makefile
+++ b/openwrt/package/tinc/Makefile
@@ -7,7 +7,9 @@ PKG_VERSION:=1.0.4
 PKG_RELEASE:=1
 PKG_MD5SUM:=63887373dd763f8d90cecc5a3616c363
 
 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
 
 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)))
 
 
 $(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)" \
        (cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \
                $(TARGET_CONFIGURE_OPTS) \
                CFLAGS="$(TARGET_CFLAGS)" \


@@ -47,18 +49,17 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
                  --with-kernel=$(LINUX_DIR) \
                  --with-zlib=$(STAGING_DIR)/usr/ \
        );
                  --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)" \
        $(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)" \
                DESTDIR="$(PKG_INSTALL_DIR)" \

-               install
-       touch $(PKG_BUILD_DIR)/.built
+               all install
+       touch $@

 
 $(IPKG_TINC):
        install -m0755 -d $(IDIR_TINC)/usr/sbin
 
 $(IPKG_TINC):
        install -m0755 -d $(IDIR_TINC)/usr/sbin