Browse Source

* avoid mixed revision information 1:realrevision in revision.inc for fpcbuild checkout

git-svn-id: trunk@29673 -
Tomas Hajny 10 years ago
parent
commit
01441be35c
2 changed files with 2 additions and 2 deletions
  1. 1 1
      compiler/Makefile
  2. 1 1
      compiler/Makefile.fpc

+ 1 - 1
compiler/Makefile

@@ -477,7 +477,7 @@ ifneq ($(REVINC),)
 override LOCALOPT+=-dREVINC
 ifeq ($(REVSTR),)
 ifneq ($(SVNVERSION),)
-REVSTR:=$(shell $(SVNVERSION) -c .)
+REVSTR:=$(subst r,,$(subst r1:,,r$(shell $(SVNVERSION) -c .)))
 export REVSTR
 else
 ifeq ($(REVINC),force)

+ 1 - 1
compiler/Makefile.fpc

@@ -225,7 +225,7 @@ override LOCALOPT+=-dREVINC
 # svnversion executable is available
 ifeq ($(REVSTR),)
 ifneq ($(SVNVERSION),)
-REVSTR:=$(shell $(SVNVERSION) -c .)
+REVSTR:=$(subst r,,$(subst r1:,,r$(shell $(SVNVERSION) -c .)))
 export REVSTR
 else
 ifeq ($(REVINC),force)