From 8793d16effea39a8f05affb7f5b2a0437bd7668e Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Fri, 5 Feb 2021 10:01:14 +0100 Subject: [PATCH] Framework: allow manual PLUGINSDIR and use it everywhere --- Mk/plugins.mk | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Mk/plugins.mk b/Mk/plugins.mk index 48bca3e95..ac202ae30 100644 --- a/Mk/plugins.mk +++ b/Mk/plugins.mk @@ -1,4 +1,4 @@ -# Copyright (c) 2015-2020 Franco Fichtner +# Copyright (c) 2015-2021 Franco Fichtner # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions @@ -27,9 +27,9 @@ all: check .include "defaults.mk" -PLUGINSDIR= ${.CURDIR}/../.. -TEMPLATESDIR= ${PLUGINSDIR}/Templates +PLUGINSDIR?= ${.CURDIR}/../.. SCRIPTSDIR= ${PLUGINSDIR}/Scripts +TEMPLATESDIR= ${PLUGINSDIR}/Templates .if exists(${GIT}) && exists(${GITVERSION}) PLUGIN_COMMIT!= ${GITVERSION} @@ -333,7 +333,7 @@ style: check @: > ${.CURDIR}/.style.out .for STYLEDIR in ${STYLEDIRS} @if [ -d ${.CURDIR}/${STYLEDIR} ]; then \ - (phpcs --standard=${.CURDIR}/../../ruleset.xml \ + (phpcs --standard=${PLUGINSDIR}/ruleset.xml \ ${.CURDIR}/${STYLEDIR} || true) > \ ${.CURDIR}/.style.out; \ fi @@ -348,7 +348,7 @@ style: check style-fix: check .for STYLEDIR in ${STYLEDIRS} @if [ -d ${.CURDIR}/${STYLEDIR} ]; then \ - phpcbf --standard=${.CURDIR}/../../ruleset.xml \ + phpcbf --standard=${PLUGINSDIR}/ruleset.xml \ ${.CURDIR}/${STYLEDIR} || true; \ fi .endfor