|
|
@@ -168,6 +168,9 @@ ifndef RTLOPT
|
|
|
RTLOPT:=$(OPT)
|
|
|
endif
|
|
|
|
|
|
+SVNVERSION:=$(firstword $(wildcard $(addsuffix /svnversion$(SRCEXEEXT),$(SEARCHPATH))))
|
|
|
+GIT:=$(firstword $(wildcard $(addsuffix /git$(SRCEXEEXT),$(SEARCHPATH))))
|
|
|
+
|
|
|
DATE_FMT = +%Y/%m/%d
|
|
|
ifdef SOURCE_DATE_EPOCH
|
|
|
COMPDATESTR ?= $(shell date -u -d "@$(SOURCE_DATE_EPOCH)" "$(DATE_FMT)" 2>/dev/null || date -u -r "$(SOURCE_DATE_EPOCH)" "$(DATE_FMT)" 2>/dev/null || date -u "$(DATE_FMT)")
|
|
|
@@ -176,7 +179,7 @@ else
|
|
|
GIT_DIR = $(wildcard ../.git)
|
|
|
ifneq ($(GIT_DIR),)
|
|
|
# ... then take date from head
|
|
|
- COMPDATESTR:=$(shell git log -1 --pretty=%cd --date=format:'%Y/%m/%d')
|
|
|
+ COMPDATESTR:=$(shell $(GIT) log -1 --pretty=%cd --date=format:'%Y/%m/%d')
|
|
|
endif
|
|
|
endif
|
|
|
|
|
|
@@ -290,9 +293,6 @@ NOCPUDEF=1
|
|
|
# Default message file
|
|
|
MSGFILE=msg/error$(FPCLANG).msg
|
|
|
|
|
|
-
|
|
|
-SVNVERSION:=$(firstword $(wildcard $(addsuffix /svnversion$(SRCEXEEXT),$(SEARCHPATH))))
|
|
|
-GIT:=$(firstword $(wildcard $(addsuffix /git$(SRCEXEEXT),$(SEARCHPATH))))
|
|
|
PPUDUMPPROG:=$(firstword $(strip $(wildcard $(addsuffix /ppudump$(SRCEXEEXT),$(SEARCHPATH)))))
|
|
|
ifndef PPUDUMP
|
|
|
ifdef PPUDUMPPROG
|
florian