From cf19e0ca8fee4139a854b08b861f022820394815 Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Wed, 12 Feb 2020 12:34:18 +0100 Subject: [PATCH] pkg: move FLAVOUR to defaults --- Makefile | 3 --- Mk/defaults.mk | 5 ++++- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 39d68cf61..900dc63fe 100644 --- a/Makefile +++ b/Makefile @@ -53,9 +53,6 @@ CORE_SURICATA?= -devel CORE_SYSLOGD?= # empty CORE_SYSLOGNG?= 3.25 -_FLAVOUR!= if [ -f ${OPENSSL} ]; then ${OPENSSL} version; fi -FLAVOUR?= ${_FLAVOUR:[1]} - .if "${FLAVOUR}" == OpenSSL || "${FLAVOUR}" == "" CORE_REPOSITORY?= ${CORE_ABI}/latest .elif "${FLAVOUR}" == LibreSSL diff --git a/Mk/defaults.mk b/Mk/defaults.mk index 52979edaf..79b74cd00 100644 --- a/Mk/defaults.mk +++ b/Mk/defaults.mk @@ -1,4 +1,4 @@ -# Copyright (c) 2016-2018 Franco Fichtner +# Copyright (c) 2016-2020 Franco Fichtner # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions @@ -28,6 +28,9 @@ PAGER?= less OPENSSL?= ${LOCALBASE}/bin/openssl +_FLAVOUR!= if [ -f ${OPENSSL} ]; then ${OPENSSL} version; fi +FLAVOUR?= ${_FLAVOUR:[1]} + PKG!= which pkg || echo true GIT!= which git || echo true ARCH!= uname -p