From 5f0996d78dd8ab81b5f1a59bbac7e8c55ed47488 Mon Sep 17 00:00:00 2001
From: marco <marco@freepascal.org>
Date: Sun, 24 Feb 2013 19:46:26 +0000
Subject: [PATCH]  * add 2.6.2 to allowed computers. Allow 2.6.0 too for a
 while.

git-svn-id: trunk@23655 -
---
 Makefile     | 5 ++++-
 Makefile.fpc | 3 +++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index f5e098d12f..d71a89908a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2013/02/20]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2013/02/24]
 #
 default: help
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim i386-android m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android
@@ -318,6 +318,7 @@ endif
 override PACKAGE_NAME=fpc
 override PACKAGE_VERSION=2.7.1
 REQUIREDVERSION=2.6.0
+REQUIREDVERSION2=2.6.2
 ifndef inOS2
 override FPCDIR:=$(BASEDIR)
 export FPCDIR
@@ -2670,10 +2671,12 @@ versioncheckstartingcompiler:
 ifndef CROSSCOMPILE
 ifndef OVERRIDEVERSIONCHECK
 ifneq ($(FPC_VERSION),$(REQUIREDVERSION))
+ifneq ($(FPC_VERSION),$(REQUIREDVERSION2))
 	$(error The only supported starting compiler version is $(REQUIREDVERSION). You are trying to build with $(FPC_VERSION). If you are absolutely sure that the current compiler is built from the exact same version/revision, you can try to use OVERRIDEVERSIONCHECK=1 to override )
 endif
 endif
 endif
+endif
 ifeq ($(findstring $(CPU_TARGET),$(BuildOnlyBaseCPUs)),)
 all: versioncheckstartingcompiler build
 install: installall
diff --git a/Makefile.fpc b/Makefile.fpc
index 2cadb4f1cb..f0d48c1585 100644
--- a/Makefile.fpc
+++ b/Makefile.fpc
@@ -21,6 +21,7 @@ rule=help
 
 [prerules]
 REQUIREDVERSION=2.6.0
+REQUIREDVERSION2=2.6.2
 
 
 # make versions < 3.77 (OS2 version) are buggy
@@ -249,10 +250,12 @@ versioncheckstartingcompiler:
 ifndef CROSSCOMPILE
 ifndef OVERRIDEVERSIONCHECK
 ifneq ($(FPC_VERSION),$(REQUIREDVERSION))
+ifneq ($(FPC_VERSION),$(REQUIREDVERSION2))
 	$(error The only supported starting compiler version is $(REQUIREDVERSION). You are trying to build with $(FPC_VERSION). If you are absolutely sure that the current compiler is built from the exact same version/revision, you can try to use OVERRIDEVERSIONCHECK=1 to override )
 endif
 endif
 endif
+endif
 
 ifeq ($(findstring $(CPU_TARGET),$(BuildOnlyBaseCPUs)),)
 all: versioncheckstartingcompiler build