diff options
author | tron <tron> | 2001-10-16 12:44:16 +0000 |
---|---|---|
committer | tron <tron> | 2001-10-16 12:44:16 +0000 |
commit | 66c214af560f9c0889adca4ee62842dfccd02ee9 (patch) | |
tree | 01912fdc42447c77c9099f740f06fe4637c6b931 /www | |
parent | ad783764464b8ba1ab88a70bce230ec857970158 (diff) | |
download | pkgsrc-66c214af560f9c0889adca4ee62842dfccd02ee9.tar.gz |
Replace "../php4" with "../../www/php4" at various locations to fix
build problems in PHP module packages outside "pkgsrc/www".
Diffstat (limited to 'www')
-rw-r--r-- | www/php4/Makefile | 4 | ||||
-rw-r--r-- | www/php4/Makefile.module | 8 | ||||
-rw-r--r-- | www/php4/Makefile.php | 8 |
3 files changed, 10 insertions, 10 deletions
diff --git a/www/php4/Makefile b/www/php4/Makefile index c9ff0eb38a9..280f3e78779 100644 --- a/www/php4/Makefile +++ b/www/php4/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.14 2001/10/16 04:54:24 jlam Exp $ +# $NetBSD: Makefile,v 1.15 2001/10/16 12:44:16 tron Exp $ -.include "../php4/Makefile.php" +.include "Makefile.php" PKGNAME= php-${PHP_VERS} PHP_PKG_VERS= # empty diff --git a/www/php4/Makefile.module b/www/php4/Makefile.module index a3d13840806..0bca922a013 100644 --- a/www/php4/Makefile.module +++ b/www/php4/Makefile.module @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.module,v 1.11 2001/10/16 12:33:46 tron Exp $ +# $NetBSD: Makefile.module,v 1.12 2001/10/16 12:44:16 tron Exp $ # # This Makefile is provided to ease creating PHP4 packages for the extension # modules distributed in the PHP4 sources. @@ -11,13 +11,13 @@ # of the PHP4 module package that don't affect other PHP4 modules. It is # typically left empty. -.include "../php4/Makefile.common" +.include "../../www/php4/Makefile.common" PKGNAME= php-${MODNAME}-${PHP_VERS} PHP_PKG_VERS?= # empty BUILD_DEPENDS+= automake>=1.4:../../devel/automake -DEPENDS+= php>=${PHP_BASE_VERS}:../php4 +DEPENDS+= php>=${PHP_BASE_VERS}:../../www/php4 PKGMODNAME= ${MODNAME:S/-/_/} MODULESDIR= ${WRKSRC}/modules @@ -59,4 +59,4 @@ do-module-install: ${INSTALL_DATA} ${MODULESDIR}/${PKGMODNAME}.so \ ${PREFIX}/${PHP_EXTENSION_DIR} -.include "../php4/buildlink.mk" +.include "../../www/php4/buildlink.mk" diff --git a/www/php4/Makefile.php b/www/php4/Makefile.php index 6d667cd10c2..0f5bf3dbb02 100644 --- a/www/php4/Makefile.php +++ b/www/php4/Makefile.php @@ -1,9 +1,9 @@ -# $NetBSD: Makefile.php,v 1.1 2001/10/16 04:54:24 jlam Exp $ +# $NetBSD: Makefile.php,v 1.2 2001/10/16 12:44:17 tron Exp $ -.include "../php4/Makefile.common" +.include "../../www/php4/Makefile.common" -DISTINFO_FILE= ${.CURDIR}/../php4/distinfo -PATCHDIR= ${.CURDIR}/../php4/patches +DISTINFO_FILE= ${.CURDIR}/../../www/php4/distinfo +PATCHDIR= ${.CURDIR}/../../www/php4/patches USE_LIBTOOL= YES LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig |