Browse Source

* Set REVSTR to empty if 'svnversion -c .' outputs 'exported'

git-svn-id: trunk@34899 -
pierre 8 years ago
parent
commit
a82a134be8
2 changed files with 2 additions and 2 deletions
  1. 1 1
      compiler/Makefile
  2. 1 1
      compiler/Makefile.fpc

+ 1 - 1
compiler/Makefile

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

+ 1 - 1
compiler/Makefile.fpc

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