# HG changeset patch
# User Franz Glasner <hg@dom66.de>
# Date 1506262024 -7200
# Node ID 4f95a4fd4d0a1493882dd4c0de3ad0157e21b98e
# Parent  db0648353d12832c4494a342bf7fdc872b41499b
Make PLUGIN_NAME the name of the output plugin now and let PLUGIN_SOURCE optionally specify the source.

This seems more logical from the user's point of view.

The PLUGIN_FILENAME_TAG variable has been removed.

diff -r db0648353d12 -r 4f95a4fd4d0a Makefile
--- a/Makefile	Sun Sep 24 03:51:09 2017 +0200
+++ b/Makefile	Sun Sep 24 16:07:04 2017 +0200
@@ -32,19 +32,18 @@
 UWSGI_NAME=	uwsginl
 PLUGIN_DIR=	lib/${UWSGI_NAME}/plugins
 
-# Native plugin name (i.e. the source directory)
-PLUGIN_NAME?=	python
 # The name of the plugin to be created (to eventually  distingush py2 and py3)
-.if defined(PLUGIN_FILENAME_TAG)
-.if ${PLUGIN_FILENAME_TAG} == ""
-PLUGIN_FILENAME_TAG=	${PLUGIN_NAME}
+PLUGIN_NAME?=	python3
+# Where to find the sources for the plugin (defaults to plugins/${PLUGIN_NAME})
+.if defined(MASTERDIR)
+.if !defined(PLUGIN_SOURCE) || empty(PLUGIN_SOURCE)
+PLUGIN_SOURCE=	plugins/${PLUGIN_NAME}
 .endif
+.else
+PLUGIN_SOURCE=	plugins/python
 .endif
-.if !defined(MASTERDIR)
-PLUGIN_FILENAME_TAG?=	python3
-.endif
-# The complete filename of the plugin
-PLUGIN_FILENAME=	${PLUGIN_FILENAME_TAG:U${PLUGIN_NAME}}_plugin.so
+# The complete basename of the plugin
+PLUGIN_FILENAME=	${PLUGIN_NAME}_plugin.so
 
 do-configure:
 	@${DO_NADA}
@@ -53,7 +52,7 @@
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${PLUGIN_DIR}
 
 do-build:
-	@(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/${UWSGI_NAME} --build-plugin "plugins/${PLUGIN_NAME} ${PLUGIN_FILENAME_TAG:U${PLUGIN_NAME}}")
+	@(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/${UWSGI_NAME} --build-plugin "${PLUGIN_SOURCE} ${PLUGIN_NAME}")
 
 do-install:
 	${INSTALL_LIB} ${BUILD_WRKSRC}/${PLUGIN_FILENAME} ${STAGEDIR}${PREFIX}/${PLUGIN_DIR}