pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/devel/php-xcache devel/php-xcache: Fix errors during s...
details: https://anonhg.NetBSD.org/pkgsrc/rev/c945b87465be
branches: trunk
changeset: 366401:c945b87465be
user: jlam <jlam%pkgsrc.org@localhost>
date: Mon Aug 14 15:25:20 2017 +0000
description:
devel/php-xcache: Fix errors during stage-install.
The package Makefile redefines ${EGDIR}, which was already defined
and used in lang/php/ext.mk. Rename the package variable to
"XCACHE_EGDIR" to avoid a symbol clash.
Arguably, the EGDIR in lang/php/ext.mk should have been namespaced
a bit better to avoid conflicts with likely variable names used in
package Makefiles, e.g., PHP_EGDIR.
diffstat:
devel/php-xcache/Makefile | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diffs (24 lines):
diff -r a4e4b200b893 -r c945b87465be devel/php-xcache/Makefile
--- a/devel/php-xcache/Makefile Mon Aug 14 15:25:09 2017 +0000
+++ b/devel/php-xcache/Makefile Mon Aug 14 15:25:20 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2016/09/11 17:03:26 taca Exp $
+# $NetBSD: Makefile,v 1.6 2017/08/14 15:25:20 jlam Exp $
MODNAME= xcache
PECL_VERSION= 3.2.0
@@ -21,11 +21,11 @@
CONFIGURE_ARGS+= --enable-${MODNAME}
USE_LIBTOOL= yes
-EGDIR= share/examples/${PHP_PKG_PREFIX}-xcache
-CONF_FILES= ${EGDIR}/xcache.ini ${PKG_SYSCONFDIR}/xcache.ini
+XCACHE_EGDIR= share/examples/${PHP_PKG_PREFIX}-xcache
+CONF_FILES= ${XCACHE_EGDIR}/xcache.ini ${PKG_SYSCONFDIR}/xcache.ini
XCACHE_DIR= share/${PHP_PKG_PREFIX}-xcache
-INSTALLATION_DIRS+= ${EGDIR} ${XCACHE_DIR}/cacher/lang
+INSTALLATION_DIRS+= ${XCACHE_EGDIR} ${XCACHE_DIR}/cacher/lang
INSTALLATION_DIRS+= ${XCACHE_DIR}/cacher/sub ${XCACHE_DIR}/common/lang
INSTALLATION_DIRS+= ${XCACHE_DIR}/coverager/lang
INSTALLATION_DIRS+= ${XCACHE_DIR}/diagnosis/lang
Home |
Main Index |
Thread Index |
Old Index