paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-12 02:06:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

Avoid troubles with exported directories

Browse Source
This commit is contained in:
Pierre Muller 2023-10-03 10:06:10 +00:00
parent 123481aa8d
commit d9ad6bdd1f
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
compiler/Makefile
View File

@ -633,7 +633,12 @@ REVSTR:=$(REVSTR)-$(word 4,$(subst -, ,$(GITDESCRIBE)))
export REVSTR export REVSTR
else else
ifneq ($(SVNVERSION),) ifneq ($(SVNVERSION),)
REVSTR:=$(subst r,,$(subst r1:,,r$(subst exported,,$(shell $(SVNVERSION) -c .)))) SVNVERSTR:=$(shell $(SVNVERSION) -c .)
ifneq ($(words $(SVNVERSTR)),1)
REVSTR:=$(subst $() $(),_,$(SVNVERSTR))
else
REVSTR:=$(subst r,,$(subst r1:,,r$(subst exported,,$(SVNVERSTR))))
endif
export REVSTR export REVSTR
endif endif
endif endif

7
compiler/Makefile.fpc
View File

@ -357,7 +357,12 @@ REVSTR:=$(REVSTR)-$(word 4,$(subst -, ,$(GITDESCRIBE)))
export REVSTR export REVSTR
else else
ifneq ($(SVNVERSION),) ifneq ($(SVNVERSION),)
REVSTR:=$(subst r,,$(subst r1:,,r$(subst exported,,$(shell $(SVNVERSION) -c .)))) SVNVERSTR:=$(shell $(SVNVERSION) -c .)
ifneq ($(words $(SVNVERSTR)),1)
REVSTR:=$(subst $() $(),_,$(SVNVERSTR))
else
REVSTR:=$(subst r,,$(subst r1:,,r$(subst exported,,$(SVNVERSTR))))
endif
export REVSTR export REVSTR
endif endif
endif endif