* add -dREVINC even when REVSTR is already set, needed for cycle

git-svn-id: trunk@14077 -

compiler/Makefile

@@ -353,12 +353,13 @@ ifeq ($(REVSTR),)
 ifneq ($(SVNVERSION),)
 REVSTR:=$(shell $(SVNVERSION) -c .)
 export REVSTR
-override LOCALOPT+=-dREVINC
 endif
 endif
 REVINC:=$(wildcard revision.inc)
 ifneq ($(REVINC),)
-ifeq ($(REVSTR),)
+override LOCALOPT+=-dREVINC
+else
+ifneq ($(REVSTR),)
 override LOCALOPT+=-dREVINC
 endif
 endif

compiler/Makefile.fpc

@@ -158,13 +158,14 @@ ifeq ($(REVSTR),)
 ifneq ($(SVNVERSION),)
 REVSTR:=$(shell $(SVNVERSION) -c .)
 export REVSTR
-override LOCALOPT+=-dREVINC
 endif
 endif
 
 REVINC:=$(wildcard revision.inc)
 ifneq ($(REVINC),)
-ifeq ($(REVSTR),)
+override LOCALOPT+=-dREVINC
+else
+ifneq ($(REVSTR),)
 override LOCALOPT+=-dREVINC
 endif
 endif