diff options
| author | jdolecek <jdolecek> | 2016-10-18 19:09:10 +0000 |
|---|---|---|
| committer | jdolecek <jdolecek> | 2016-10-18 19:09:10 +0000 |
| commit | 364e0459d7fbc227e2fa676d7ddfb0a6967e9351 (patch) | |
| tree | 68e3b01309c947c4550ea0c2dfdd6b63b6cf2851 /lang | |
| parent | ed18b79580e387e2f2d8b3c13984b25f12edc09c (diff) | |
| download | pkgsrc-364e0459d7fbc227e2fa676d7ddfb0a6967e9351.tar.gz | |
rename EXT_CONF_DIR to PHP_EXT_CONF_DIR, adjust it so that it's overridable
in mk.conf, and adjust working in MESSAGE.module to say more clearly
what is happening
PR pkg/51456 by Joern Clausen
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/php/MESSAGE.module | 13 | ||||
| -rw-r--r-- | lang/php/ext.mk | 12 |
2 files changed, 12 insertions, 13 deletions
diff --git a/lang/php/MESSAGE.module b/lang/php/MESSAGE.module index c161596b650..07820f2ad07 100644 --- a/lang/php/MESSAGE.module +++ b/lang/php/MESSAGE.module @@ -1,12 +1,11 @@ =========================================================================== -$NetBSD: MESSAGE.module,v 1.4 2016/07/17 15:49:44 jdolecek Exp $ +$NetBSD: MESSAGE.module,v 1.5 2016/10/18 19:09:10 jdolecek Exp $ -Module configuration file was created and module should be autoloaded: -${EXT_CONF_DIR}/${MODNAME}.ini +By default, example module configuration file was copied to following +location, and module should be auto-loaded: +${PHP_EXT_CONF_DIR}/${MODNAME}.ini -Make sure to update your ${PKG_SYSCONFDIR}/php.ini to not load this -extension explicitely, remove: +If you use custom ${PKG_SYSCONFDIR}/php.ini, or nonstandard module +configuration file location, you might need to add explicit load directive: ${EXTENSION_DIRECTIVE}=${EXTENSION_FILE} - -Restart your ${PKG_PHP}-enabled HTTP server to load this module. =========================================================================== diff --git a/lang/php/ext.mk b/lang/php/ext.mk index f17f23f5f10..3c24e2a994c 100644 --- a/lang/php/ext.mk +++ b/lang/php/ext.mk @@ -1,4 +1,4 @@ -# $NetBSD: ext.mk,v 1.42 2016/07/26 08:19:45 jdolecek Exp $ +# $NetBSD: ext.mk,v 1.43 2016/10/18 19:09:10 jdolecek Exp $ # # PHP extension package framework, for both PECL and bundled PHP extensions. # @@ -50,11 +50,11 @@ EXTRACT_SUFX?= .tgz .endif EGDIR= ${PREFIX}/share/examples/php -CONF_FILES= ${EGDIR}/${MODNAME}.ini ${EXT_CONF_DIR}/${MODNAME}.ini +CONF_FILES= ${EGDIR}/${MODNAME}.ini ${PHP_EXT_CONF_DIR}/${MODNAME}.ini -EXT_CONF_DIR= ${PKG_SYSCONFDIR}/php.d -MAKE_DIRS+= ${EXT_CONF_DIR} -MAKE_DIRS+= ${EGDIR} +PHP_EXT_CONF_DIR?= ${PKG_SYSCONFDIR}/php.d +MAKE_DIRS+= ${PHP_EXT_CONF_DIR} +MAKE_DIRS+= ${EGDIR} SUBST_CLASSES+= ext-ini SUBST_FILES.ext-ini= ${MODNAME}.ini @@ -82,7 +82,7 @@ MAKE_ENV+= EXPORT_SYMBOLS_LDFLAGS="${EXPORT_SYMBOLS_LDFLAGS}" PLIST_SRC+= ${.CURDIR}/../../lang/php/PLIST.module MESSAGE_SRC+= ${.CURDIR}/../../lang/php/MESSAGE.module MESSAGE_SUBST+= MODNAME=${PKGMODNAME} -MESSAGE_SUBST+= EXT_CONF_DIR=${EXT_CONF_DIR} +MESSAGE_SUBST+= PHP_EXT_CONF_DIR=${PHP_EXT_CONF_DIR} .if !empty(PHP_ZEND_EXTENSION:U:M[Yy][Ye][Ss]) EXTENSION_DIRECTIVE= zend_extension EXTENSION_FILE= ${PREFIX}/${PHP_EXTENSION_DIR}/${PKGMODNAME}.${SHLIB_SUFFIX} |