upstream/opnsense-plugins
1
0
Fork 0
mirror of https://github.com/opnsense/plugins.git synced 2026-05-28 04:34:15 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

plugins: simplify this just a little #4202

Browse source
This commit is contained in:
Franco Fichtner 2024-08-27 11:57:30 +02:00
parent 39104124c3
commit f885287665
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/plugins.mk
View file

@ -81,7 +81,8 @@ PLUGIN_NAME:= ${${PLUGIN_VARIANT}_NAME}
.error Plugin variant '${PLUGIN_VARIANT}' does not exist
.endif
.for _PLUGIN_VARIANT in ${PLUGIN_VARIANTS:N${PLUGIN_VARIANT}}
PLUGIN_CONFLICTS+= ${PLUGIN_PREFIX}${${_PLUGIN_VARIANT}_NAME}${PLUGIN_SUFFIX} ${PLUGIN_PREFIX}${${_PLUGIN_VARIANT}_NAME}
PLUGIN_CONFLICTS+= ${${_PLUGIN_VARIANT}_NAME}${PLUGIN_SUFFIX} \
${${_PLUGIN_VARIANT}_NAME}
.endfor
PLUGIN_DEPENDS+= ${${PLUGIN_VARIANT}_DEPENDS}
.endif
@ -92,13 +93,15 @@ PLUGIN_DIR?= ${.CURDIR:S/\// /g:[-2]}/${.CURDIR:S/\// /g:[-1]}
.endif
.if "${PLUGIN_DEVEL}" != ""
PLUGIN_CONFLICTS+= ${PLUGIN_PREFIX}${PLUGIN_NAME}
PLUGIN_CONFLICTS+= ${PLUGIN_NAME}
PLUGIN_PKGSUFFIX= ${PLUGIN_SUFFIX}
.else
PLUGIN_CONFLICTS+= ${PLUGIN_PREFIX}${PLUGIN_NAME}${PLUGIN_SUFFIX}
PLUGIN_CONFLICTS+= ${PLUGIN_NAME}${PLUGIN_SUFFIX}
PLUGIN_PKGSUFFIX= # empty
.endif
PLUGIN_CONFLICTS:= ${PLUGIN_CONFLICTS:S/^/${PLUGIN_PREFIX}/g:O}
PLUGIN_PKGNAME= ${PLUGIN_PREFIX}${PLUGIN_NAME}${PLUGIN_PKGSUFFIX}
PLUGIN_PKGNAMES= ${PLUGIN_CONFLICTS} ${PLUGIN_PKGNAME}