diff options
| author | jlam <jlam> | 2005-09-04 20:13:59 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2005-09-04 20:13:59 +0000 |
| commit | ce1eca0bfa3a4f9b8a38cffe6703c91924fbfaf1 (patch) | |
| tree | 90fad7ca5c645bee37eb46444705a07e3f99d7ea | |
| parent | ab1137e238c82eb6356c2c055e25df4a874153b9 (diff) | |
| download | pkgsrc-ce1eca0bfa3a4f9b8a38cffe6703c91924fbfaf1.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.
| -rw-r--r-- | lang/php5/Makefile | 5 | ||||
| -rw-r--r-- | lang/php5/Makefile.php | 4 | ||||
| -rw-r--r-- | www/php4/Makefile | 5 | ||||
| -rw-r--r-- | www/php4/Makefile.php | 4 |
4 files changed, 10 insertions, 8 deletions
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 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 |