Browse Source

Avoid failure in exported directories

git-svn-id: trunk@23995 -
pierre 12 years ago
parent
commit
921deb7ac7
1 changed files with 9 additions and 4 deletions
  1. 9 4
      utils/fpcm/Makefile.fpc

+ 9 - 4
utils/fpcm/Makefile.fpc

@@ -32,6 +32,9 @@ endif
 REVINC_FILES=$(wildcard fpcm*.pp fpcmake.ini Makefile.fpc)
 REVINC_FILES=$(wildcard fpcm*.pp fpcmake.ini Makefile.fpc)
 
 
 SVN:=$(firstword $(wildcard $(addsuffix /svn$(SRCEXEEXT),$(SEARCHPATH))))
 SVN:=$(firstword $(wildcard $(addsuffix /svn$(SRCEXEEXT),$(SEARCHPATH))))
+SVNLOG:=svninfo.log
+# This one can be overriden on command line for debugging purposes
+GETREVEXE:=./getrev$(EXEEXT)
 
 
 [rules]
 [rules]
 .NOTPARALLEL:
 .NOTPARALLEL:
@@ -51,16 +54,18 @@ endif
 ifneq (,$(SVN))
 ifneq (,$(SVN))
 # revision.inc rule
 # revision.inc rule
 revision.inc : $(REVINC_FILES)
 revision.inc : $(REVINC_FILES)
-	$(SVN) info $(REVINC_FILES) > svninfo.log
+	-$(SVN) info $(REVINC_FILES) > $(SVNLOG)
 	$(MAKE) getrev$(EXEEXT)
 	$(MAKE) getrev$(EXEEXT)
-	./getrev$(EXEEXT) svninfo.log
+	$(GETREVEXE) $(SVNLOG)
+	-$(DEL) getrev$(EXEEXT)
 endif
 endif
 
 
 .PHONY : revision
 .PHONY : revision
 
 
+# Use -B option to force
+# regeneration of revision.inc
 revision :
 revision :
-	$(DEL) revision.inc
-	$(MAKE) revision.inc
+	$(MAKE) -B revision.inc
 
 
 
 
 fpcmwr$(PPUEXT): fpcmake.inc
 fpcmwr$(PPUEXT): fpcmake.inc