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

git-svn-id: trunk@14077 -
This commit is contained in:
pierre 2009-11-06 10:34:24 +00:00
parent b6d0a93599
commit 2295a9f23b
2 changed files with 6 additions and 4 deletions

View File

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

View File

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