]> err.no Git - yubikey-personalization/commitdiff
use correct download location for libjson
authorKlas Lindfors <klas@yubico.com>
Tue, 16 Apr 2013 13:35:45 +0000 (14:35 +0100)
committerKlas Lindfors <klas@yubico.com>
Tue, 16 Apr 2013 13:37:29 +0000 (14:37 +0100)
ykpers4mac.mk
ykpers4win.mk

index 1060221f022260debd593dadf05430d8c248b774..a9277aea38497fb862b42a2f260d1676c3862811 100644 (file)
@@ -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 && \
index 0b9f7767a40a6924880eb5467ad02eff01644fb7..d09dfca555a1192d8d21ed2716649c251348306a 100644 (file)
@@ -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 && \