From 4fdaf0e14e092325cc763024e93f894a8de82e65 Mon Sep 17 00:00:00 2001 From: Etienne Renault Date: Tue, 31 Jan 2017 16:09:07 +0100 Subject: [PATCH] use wget or curl according to what is available * doc/Makefile.am, elisp/Makefile.am: here. * HACKING: add missing requirements. --- HACKING | 1 + doc/Makefile.am | 2 +- elisp/Makefile.am | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/HACKING b/HACKING index b170efc32..03c8e66ca 100644 --- a/HACKING +++ b/HACKING @@ -38,6 +38,7 @@ since the generated files they produce are distributed.) Python >= 3.3, IPython >= 2.3 GraphViz Java >= 1.7 (needed to run PlantUML while generating the doc) + wget or curl (needed to download PlantUML) The following additional tools are used if they are present, or only for certain operations (like releases): diff --git a/doc/Makefile.am b/doc/Makefile.am index 5e4c67854..c98f07661 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -62,7 +62,7 @@ org: $(EMACS) --batch -Q -l org/init.el org/plantuml.jar: - wget http://downloads.sourceforge.net/project/plantuml/plantuml.jar -O org/plantuml.jar + wget http://downloads.sourceforge.net/project/plantuml/plantuml.jar -O org/plantuml.jar || curl http://downloads.sourceforge.net/project/plantuml/plantuml.jar -o org/plantuml.jar org-man: mkdir -p $(srcdir)/userdoc/man diff --git a/elisp/Makefile.am b/elisp/Makefile.am index b3c105ca1..93d720a5f 100644 --- a/elisp/Makefile.am +++ b/elisp/Makefile.am @@ -1,5 +1,5 @@ ## -*- coding: utf-8 -*- -## Copyright (C) 2015, 2016 Laboratoire de Recherche et Développement +## Copyright (C) 2015, 2016, 2017 Laboratoire de Recherche et Développement ## de l'Epita (LRDE). ## ## This file is part of Spot, a model checking library. @@ -23,5 +23,5 @@ GIT = https://gitlab.lrde.epita.fr/spot/emacs-modes/raw/master/ .PHONY: update-el update-el: - wget $(GIT)/hoa-mode.el -O $(srcdir)/hoa-mode.el + wget $(GIT)/hoa-mode.el -O $(srcdir)/hoa-mode.el || curl $(GIT)/hoa-mode.el -o $(srcdir)/hoa-mode.el chmod a-w $(srcdir)/hoa-mode.el