From bffae8c0dab3ec554bd06d04401e8cb96bd20189 Mon Sep 17 00:00:00 2001 From: jlam Date: Sun, 4 Sep 2005 20:13:59 +0000 Subject: Move some options that only apply to the PHP CGI package from Makefile.php (shared with ap-php) into the php package Makefile. --- lang/php5/Makefile | 5 ++++- lang/php5/Makefile.php | 4 +--- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'lang/php5') diff --git a/lang/php5/Makefile b/lang/php5/Makefile index b79aa7655e0..3624a83f390 100644 --- a/lang/php5/Makefile +++ b/lang/php5/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2005/09/03 13:37:36 adrianp Exp $ +# $NetBSD: Makefile,v 1.15 2005/09/04 20:13:59 jlam Exp $ # PKGNAME= php-${PHP_BASE_VERS} @@ -14,6 +14,9 @@ LIBTOOL_OVERRIDE= # empty .include "Makefile.php" +CONFIGURE_ARGS+= --enable-discard-path +CONFIGURE_ARGS+= --enable-force-cgi-redirect + CGIDIR= ${PREFIX}/libexec/cgi-bin EGDIR= ${PREFIX}/share/examples/php diff --git a/lang/php5/Makefile.php b/lang/php5/Makefile.php index 5b067968f08..a716eacef30 100644 --- a/lang/php5/Makefile.php +++ b/lang/php5/Makefile.php @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.php,v 1.6 2005/05/31 10:01:37 dillo Exp $ +# $NetBSD: Makefile.php,v 1.7 2005/09/04 20:13:59 jlam Exp $ # .include "../../lang/php5/Makefile.common" @@ -24,8 +24,6 @@ CONFIGURE_ARGS+= --without-mysql CONFIGURE_ARGS+= --without-sqlite CONFIGURE_ARGS+= --without-iconv -CONFIGURE_ARGS+= --enable-discard-path -CONFIGURE_ARGS+= --enable-force-cgi-redirect CONFIGURE_ARGS+= --enable-memory-limit CONFIGURE_ARGS+= --enable-track-vars -- cgit v1.2.3