d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move GIT_CMD a few lines down, so it is not in between SVN_*

Browse Source 
lines.

Sponsored by:	Rubicon Communications, LLC (netgate.com)
This commit is contained in:
Glen Barber 2020-07-16 20:44:04 +00:00
parent ff1031c1b7
commit 40056899f6
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Makefile.inc1
View File

@ -478,14 +478,6 @@ SVN_CMD= ${_P}/${_S}
. endfor . endfor
.export SVN_CMD .export SVN_CMD
.endif .endif
.if !defined(GIT_CMD) || empty(GIT_CMD)
. for _P in /usr/bin /usr/local/bin
. if exists(${_P}/git)
GIT_CMD= ${_P}/git
. endif
. endfor
.export GIT_CMD
.endif
SVNFLAGS?= -r HEAD SVNFLAGS?= -r HEAD
.if !defined(VCS_REVISION) || empty(VCS_REVISION) .if !defined(VCS_REVISION) || empty(VCS_REVISION)
.if !defined(SVNVERSION_CMD) || empty(SVNVERSION_CMD) .if !defined(SVNVERSION_CMD) || empty(SVNVERSION_CMD)
@ -505,6 +497,15 @@ VCS_REVISION= $$(echo r${_VCS_REVISION})
.export VCS_REVISION .export VCS_REVISION
.endif .endif
.if !defined(GIT_CMD) || empty(GIT_CMD)
. for _P in /usr/bin /usr/local/bin
. if exists(${_P}/git)
GIT_CMD= ${_P}/git
. endif
. endfor
.export GIT_CMD
.endif
.if !defined(OSRELDATE) .if !defined(OSRELDATE)
.if exists(/usr/include/osreldate.h) .if exists(/usr/include/osreldate.h)
OSRELDATE!= awk '/^\#define[[:space:]]*__FreeBSD_version/ { print $$3 }' \ OSRELDATE!= awk '/^\#define[[:space:]]*__FreeBSD_version/ { print $$3 }' \