From e80e2aae74ee93df3c01e9edc6d79a39e02e8c40 Mon Sep 17 00:00:00 2001 From: Niels Kristian Bech Jensen Date: Thu, 26 Dec 2013 13:30:54 +1100 Subject: [PATCH] Makefile and docs: update automake version requirement Conflicts: Makefile --- Makefile | 2 +- index.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index eef1c698..5520a78f 100644 --- a/Makefile +++ b/Makefile @@ -134,7 +134,7 @@ $(PREFIX)/installed/check-requirements: $(MAKEFILE) @echo '[check requirements]' $(foreach REQUIREMENT,$(REQUIREMENTS),$(call CHECK_REQUIREMENT,$(REQUIREMENT))) $(call CHECK_REQUIREMENT_VERSION,autoconf,2\.6[4-9]\|2\.[7-9][0-9]) - $(call CHECK_REQUIREMENT_VERSION,automake,1\.[1-9][2-9]\(\.[0-9]\+\)\?) + $(call CHECK_REQUIREMENT_VERSION,automake,1\.11\.[3-9]\|1\.[1-9][2-9]\(\.[0-9]\+\)\?) @[ -d '$(PREFIX)/installed' ] || mkdir -p '$(PREFIX)/installed' @touch '$@' diff --git a/index.html b/index.html index b0ed5c68..bd9f64fd 100644 --- a/index.html +++ b/index.html @@ -660,7 +660,7 @@ USE_OSGPLUGIN(<plugin2>) Automake - ≥ 1.12 + ≥ 1.11.3 Bash