lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-13 00:07:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

pkg: better fix, /usr/sbin/pkg is used always :/

Browse Source
This commit is contained in:
Franco Fichtner 2021-01-24 11:31:23 +01:00
parent c455ebbe6e
commit 58f0a7ec08
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Mk/defaults.mk
View File

@ -1,4 +1,4 @@
# Copyright (c) 2016-2020 Franco Fichtner <franco@opnsense.org>
# Copyright (c) 2016-2021 Franco Fichtner <franco@opnsense.org>
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
@ -26,7 +26,10 @@
LOCALBASE?= /usr/local
PAGER?= less
PKG!= which pkg || echo true
PKG= ${LOCALBASE}/sbin/pkg
.if ! exists(${PKG})
PKG= true
.endif
GIT!= which git || echo true
GITVERSION= ${.CURDIR}/Scripts/version.sh
@ -67,7 +70,7 @@ _CORE_PYTHON!= ${PYTHONLINK} -V
CORE_PYTHON?= ${_CORE_PYTHON:[2]:S/./ /g:[1..2]:tW:S/ //}
.endif
.if exists(${PKG}) && ${PKG} != "/usr/sbin/pkg"
.if exists(${PKG})
_CORE_SYSLOGNG!= ${PKG} query %v syslog-ng
CORE_SYSLOGNG?= ${_CORE_SYSLOGNG:S/./ /g:[1..2]:tW:S/ /./g}
.endif