pkg: move FLAVOUR to defaults
This commit is contained in:
parent
877361d3c0
commit
cf19e0ca8f
3
Makefile
3
Makefile
|
@ -53,9 +53,6 @@ CORE_SURICATA?= -devel
|
||||||
CORE_SYSLOGD?= # empty
|
CORE_SYSLOGD?= # empty
|
||||||
CORE_SYSLOGNG?= 3.25
|
CORE_SYSLOGNG?= 3.25
|
||||||
|
|
||||||
_FLAVOUR!= if [ -f ${OPENSSL} ]; then ${OPENSSL} version; fi
|
|
||||||
FLAVOUR?= ${_FLAVOUR:[1]}
|
|
||||||
|
|
||||||
.if "${FLAVOUR}" == OpenSSL || "${FLAVOUR}" == ""
|
.if "${FLAVOUR}" == OpenSSL || "${FLAVOUR}" == ""
|
||||||
CORE_REPOSITORY?= ${CORE_ABI}/latest
|
CORE_REPOSITORY?= ${CORE_ABI}/latest
|
||||||
.elif "${FLAVOUR}" == LibreSSL
|
.elif "${FLAVOUR}" == LibreSSL
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
# Copyright (c) 2016-2018 Franco Fichtner <franco@opnsense.org>
|
# Copyright (c) 2016-2020 Franco Fichtner <franco@opnsense.org>
|
||||||
#
|
#
|
||||||
# Redistribution and use in source and binary forms, with or without
|
# Redistribution and use in source and binary forms, with or without
|
||||||
# modification, are permitted provided that the following conditions
|
# modification, are permitted provided that the following conditions
|
||||||
|
@ -28,6 +28,9 @@ PAGER?= less
|
||||||
|
|
||||||
OPENSSL?= ${LOCALBASE}/bin/openssl
|
OPENSSL?= ${LOCALBASE}/bin/openssl
|
||||||
|
|
||||||
|
_FLAVOUR!= if [ -f ${OPENSSL} ]; then ${OPENSSL} version; fi
|
||||||
|
FLAVOUR?= ${_FLAVOUR:[1]}
|
||||||
|
|
||||||
PKG!= which pkg || echo true
|
PKG!= which pkg || echo true
|
||||||
GIT!= which git || echo true
|
GIT!= which git || echo true
|
||||||
ARCH!= uname -p
|
ARCH!= uname -p
|
||||||
|
|
Loading…
Reference in New Issue