# HG changeset patch # User Franz Glasner # Date 1506268589 -7200 # Node ID 99e00e5a382310bc1019174470fa659154fac261 # Parent 4f95a4fd4d0a1493882dd4c0de3ad0157e21b98e Better support for slave ports: 1. Provide an UWSGI_PATH variable to point to the installed uwsginl binary 2. Remove "pre-build" target and integrate into "do-build". This is to allow slave ports check some preconditions in their "pre-build" target. diff -r 4f95a4fd4d0a -r 99e00e5a3823 Makefile --- a/Makefile Sun Sep 24 16:07:04 2017 +0200 +++ b/Makefile Sun Sep 24 17:56:29 2017 +0200 @@ -30,6 +30,7 @@ MAKE_ENV+= UWSGI_PROFILE_OVERRIDE=plugin_build_dir=${STAGEDIR}${PREFIX}/${PLUGIN_DIR};plugin_dir=${PREFIX}/${PLUGIN_DIR} PYTHON=${PYTHON_CMD} UWSGI_NAME= uwsginl +UWSGI_PATH= ${PREFIX}/bin/${UWSGI_NAME} PLUGIN_DIR= lib/${UWSGI_NAME}/plugins # The name of the plugin to be created (to eventually distingush py2 and py3) @@ -48,11 +49,9 @@ do-configure: @${DO_NADA} -pre-build: +do-build: @${MKDIR} ${STAGEDIR}${PREFIX}/${PLUGIN_DIR} - -do-build: - @(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/${UWSGI_NAME} --build-plugin "${PLUGIN_SOURCE} ${PLUGIN_NAME}") + @(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${UWSGI_PATH} --build-plugin "${PLUGIN_SOURCE} ${PLUGIN_NAME}") do-install: ${INSTALL_LIB} ${BUILD_WRKSRC}/${PLUGIN_FILENAME} ${STAGEDIR}${PREFIX}/${PLUGIN_DIR}