From: Klas Lindfors Date: Tue, 16 Apr 2013 13:35:45 +0000 (+0100) Subject: use correct download location for libjson X-Git-Tag: v1.13.0~25^2 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a983ce7a02969cc9aa5e29dc3a22159c9cc5f55d;p=yubikey-personalization use correct download location for libjson --- diff --git a/ykpers4mac.mk b/ykpers4mac.mk index 1060221..a9277ae 100644 --- a/ykpers4mac.mk +++ b/ykpers4mac.mk @@ -28,7 +28,7 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. LIBYUBIKEYVERSION=1.10 -LIBJSONVERSION=0.11-20130402 +LIBJSONVERSION=0.11 PROJECT=yubikey-personalization PACKAGE=ykpers @@ -48,9 +48,9 @@ ykpers4mac: rm -rf tmp && mkdir tmp && cd tmp && \ mkdir -p root/licenses && \ cp ../json-c-$(LIBJSONVERSION) . \ - || wget --no-check-certificate https://github.com/json-c/json-c/tarball/json-c-$(LIBJSONVERSION) && \ - tar xfz json-c-$(LIBJSONVERSION) && \ - cd json-c-json-c-* && \ + || wget --no-check-certificate https://s3.amazonaws.com/json-c_releases/releases/json-c-$(LIBJSONVERSION).tar.gz && \ + tar xfz json-c-$(LIBJSONVERSION).tar.gz && \ + cd json-c-$(LIBJSONVERSION) && \ ./configure --prefix=$(PWD)/tmp/root && \ make install $(CHECK) && \ install_name_tool -id @executable_path/../lib/libjson-c.2.dylib $(PWD)/tmp/root/lib/libjson-c.2.dylib && \ diff --git a/ykpers4win.mk b/ykpers4win.mk index 0b9f776..d09dfca 100644 --- a/ykpers4win.mk +++ b/ykpers4win.mk @@ -27,7 +27,7 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. LIBYUBIKEYVERSION=1.10 -LIBJSONVERSION=0.11-20130402 +LIBJSONVERSION=0.11 PROJECT=yubikey-personalization PACKAGE=ykpers @@ -47,9 +47,9 @@ ykpers4win: rm -rf tmp && mkdir tmp && cd tmp && \ mkdir -p root/licenses && \ cp ../json-c-$(LIBJSONVERSION) . \ - || wget https://github.com/json-c/json-c/tarball/json-c-$(LIBJSONVERSION) && \ - tar xfa json-c-$(LIBJSONVERSION) && \ - cd json-c-json-c-* && \ + || wget --no-check-certificate https://s3.amazonaws.com/json-c_releases/releases/json-c-$(LIBJSONVERSION).tar.gz && \ + tar xfa json-c-$(LIBJSONVERSION).tar.gz && \ + cd json-c-$(LIBJSONVERSION) && \ ac_cv_func_realloc_0_nonnull=yes ac_cv_func_malloc_0_nonnull=yes ./configure --host=$(HOST) --build=x86_64-unknown-linux-gnu --prefix=$(PWD)/tmp/root && \ make install && \ cp COPYING $(PWD)/tmp/root/licenses/json-c.txt && \