changeset 2476:64ee707dd119

Merge branch 'stable'
author Volker Grabsch <vog@notjusthosting.com>
date Wed, 02 May 2012 15:43:16 +0200
parents 145b67adfecf (current diff) 9e60296cb20d (diff)
children 54363e195f8b
files
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Wed May 02 23:32:07 2012 +1000
+++ b/Makefile	Wed May 02 15:43:16 2012 +0200
@@ -101,7 +101,7 @@
 	@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][0-9]\.[0-9]\+)
+	$(call CHECK_REQUIREMENT_VERSION,automake,1\.[1-9][0-9]\(\.[0-9]\+\)\?)
 	@[ -d '$(PREFIX)/installed' ] || mkdir -p '$(PREFIX)/installed'
 	@touch '$@'