summaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2005-09-04 20:13:59 +0000
committerjlam <jlam@pkgsrc.org>2005-09-04 20:13:59 +0000
commit2b2a2f2f1556c9211e059454101a8f6b8d344e0b (patch)
tree90fad7ca5c645bee37eb46444705a07e3f99d7ea /www
parentb3f48a818c57f49e89ad240e421a05d148889c1e (diff)
downloadpkgsrc-2b2a2f2f1556c9211e059454101a8f6b8d344e0b.tar.gz
Move some options that only apply to the PHP CGI package from Makefile.php
(shared with ap-php) into the php package Makefile.
Diffstat (limited to 'www')
-rw-r--r--www/php4/Makefile5
-rw-r--r--www/php4/Makefile.php4
2 files changed, 5 insertions, 4 deletions
diff --git a/www/php4/Makefile b/www/php4/Makefile
index 8e247362c0d..73eb66d4a97 100644
--- a/www/php4/Makefile
+++ b/www/php4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.49 2005/08/18 07:47:50 tron Exp $
+# $NetBSD: Makefile,v 1.50 2005/09/04 20:13:59 jlam Exp $
PKGNAME= php-${PHP_BASE_VERS}
CATEGORIES+= lang
@@ -14,6 +14,9 @@ USE_TOOLS+= gmake
.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/www/php4/Makefile.php b/www/php4/Makefile.php
index bdb6fd53676..5f7565aa979 100644
--- a/www/php4/Makefile.php
+++ b/www/php4/Makefile.php
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.php,v 1.22 2005/05/31 10:01:40 dillo Exp $
+# $NetBSD: Makefile.php,v 1.23 2005/09/04 20:13:59 jlam Exp $
.include "../../www/php4/Makefile.common"
@@ -18,8 +18,6 @@ CONFIGURE_ARGS+= --with-config-file-path=${PKG_SYSCONFDIR}
CONFIGURE_ARGS+= --with-exec-dir=${PREFIX}/libexec/php4
CONFIGURE_ARGS+= --with-regex=system
-CONFIGURE_ARGS+= --enable-discard-path
-CONFIGURE_ARGS+= --enable-force-cgi-redirect
CONFIGURE_ARGS+= --enable-memory-limit
CONFIGURE_ARGS+= --enable-track-vars