diff options
| -rw-r--r-- | Makefile.inc1 | 10 | ||||
| -rw-r--r-- | share/mk/bsd.own.mk | 11 |
2 files changed, 10 insertions, 11 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index a242df17e69e..bcc46f2115e2 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -350,6 +350,16 @@ SVN= ${_P}/${_S} .endif SVNFLAGS?= -r HEAD .if !defined(VCS_REVISION) && empty(VCS_REVISION) +.if !defined(SVNVERSION_CMD) && empty(SVNVERSION_CMD) +. for _D in ${PATH:S,:, ,g} +. if exists(${_D}/svnversion) +SVNVERSION_CMD?=${_D}/svnversion +. endif +. if exists(${_D}/svnliteversion) +SVNVERSION_CMD?=${_D}/svnliteversion +. endif +. endfor +.endif _VCS_REVISION?= $$(eval ${SVNVERSION_CMD} ${SRCDIR}) . if !empty(_VCS_REVISION) VCS_REVISION= $$(echo r${_VCS_REVISION}) diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk index 07bad561acc7..70103c00555f 100644 --- a/share/mk/bsd.own.mk +++ b/share/mk/bsd.own.mk @@ -230,17 +230,6 @@ XZ_CMD?= xz -T ${XZ_THREADS} XZ_CMD?= xz .endif -.if !defined(SVNVERSION_CMD) && empty(SVNVERSION_CMD) -. for _D in ${PATH:S,:, ,g} -. if exists(${_D}/svnversion) -SVNVERSION_CMD?=${_D}/svnversion -. endif -. if exists(${_D}/svnliteversion) -SVNVERSION_CMD?=${_D}/svnliteversion -. endif -. endfor -.endif - PKG_CMD?= pkg # Pointer to the top directory into which tests are installed. Should not be |