mirror of
https://github.com/netbirdio/plugins.git
synced 2026-05-22 18:44:07 -07:00
plugins: simplify this just a little #4202
This commit is contained in:
+6
-3
@@ -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}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user