Browse Source

* fix problem when svn is not found and add phony revision rule

git-svn-id: trunk@14085 -
pierre 15 years ago
parent
commit
b9a8592a11
2 changed files with 20 additions and 0 deletions
  1. 9 0
      compiler/Makefile
  2. 11 0
      compiler/Makefile.fpc

+ 9 - 0
compiler/Makefile

@@ -356,6 +356,11 @@ ifeq ($(REVSTR),)
 ifneq ($(SVNVERSION),)
 REVSTR:=$(shell $(SVNVERSION) -c .)
 export REVSTR
+else
+ifeq ($(REVINC),force)
+REVSTR:=exported
+export REVSTR
+endif
 endif
 endif
 endif
@@ -3347,6 +3352,10 @@ endif
 else
 	$(MAKE) revision.inc REVINC=force
 endif
+.PHONY : revision
+revision :
+	$(DEL) revision.inc
+	$(MAKE) revision.inc
 $(EXENAME) : $(wildcard *.pas) $(wildcard *.inc) msg \
 	     $(wildcard systems/*.pas) $(wilcard systems/*.inc) \
 	     $(wildcard $(CPC_TARGET)/*.pas) $(wildcard $(CPC_TARGET)/*.inc)

+ 11 - 0
compiler/Makefile.fpc

@@ -164,6 +164,11 @@ ifeq ($(REVSTR),)
 ifneq ($(SVNVERSION),)
 REVSTR:=$(shell $(SVNVERSION) -c .)
 export REVSTR
+else
+ifeq ($(REVINC),force)
+REVSTR:=exported
+export REVSTR
+endif
 endif
 endif
 endif
@@ -396,6 +401,12 @@ else
 	$(MAKE) revision.inc REVINC=force
 endif
 
+.PHONY : revision
+
+revision :
+	$(DEL) revision.inc
+	$(MAKE) revision.inc
+
 # Make only the compiler
 # ECHOREDIR sometimes does not remove double quotes
 $(EXENAME) : $(wildcard *.pas) $(wildcard *.inc) msg \