From fb400d6081f67b628d7627bc85e460d779e72dcd Mon Sep 17 00:00:00 2001 From: Hugo Herbelin Date: Sat, 27 Apr 2019 12:11:45 +0200 Subject: Amending CYGWIN fix in 63e7fb56923 so that it does not add a warning on MacOS. Indeed, MacOS has a BSD uname and BSD uname does not support the -o option. Based on the following resources about uname compatility: https://stackoverflow.com/questions/3466166/how-to-check-if-running-in-cygwin-mac-or-linux https://en.wikipedia.org/wiki/Uname --- Makefile.doc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.doc b/Makefile.doc index e89a20393c..23aa66a1b8 100644 --- a/Makefile.doc +++ b/Makefile.doc @@ -31,8 +31,8 @@ DVIPS:=dvips HTMLSTYLE:=coqremote # Sphinx-related variables -OSNAME:=$(shell uname -o) -ifeq ($(OSNAME),Cygwin) +OSNAME:=$(shell uname -s) +ifeq ($(findstring CYGWIN,$(OSNAME)),CYGWIN) WIN_CURDIR:=$(shell cygpath -w $(CURDIR)) SPHINXENV:=COQBIN="$(CURDIR)/bin/" COQLIB="$(WIN_CURDIR)" else -- cgit v1.2.3