OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 27-Nov-2003 14:27:32
Branch: HEAD Handle: 2003112713273200
Modified files:
openpkg-src/apache apache.spec
Log:
be more flexible for make sure empty lib/php does not exist
Summary:
Revision Changes Path
1.184 +3 -1 openpkg-src/apache/apache.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.spec
============================================================================
$ cvs diff -u -r1.183 -r1.184 apache.spec
--- openpkg-src/apache/apache.spec 27 Nov 2003 12:06:38 -0000 1.183
+++ openpkg-src/apache/apache.spec 27 Nov 2003 13:27:32 -0000 1.184
@@ -71,6 +71,7 @@
# package options (suphp related)
%option with_suphp no
%option with_suphp_caller %{l_nusr}
+%option with_suphp_phpcgi %{l_prefix}/cgi/php
# package options (additionally used Apache modules; can be enabled without
thinking)
%option with_mod_ssl no
@@ -843,7 +844,7 @@
--prefix=%{l_prefix} \
--with-apxs="" \
--with-apache-user=%{with_suphp_caller} \
- --with-php=%{l_prefix}/cgi/php \
+ --with-php=%{with_suphp_phpcgi} \
--with-logfile=%{l_prefix}/var/apache/log/suphp.log
%{l_make} %{l_mflags -O}
) || exit $?
@@ -1010,6 +1011,7 @@
$RPM_BUILD_ROOT%{l_prefix}/etc/apache/php.ini
rm -rf $RPM_BUILD_ROOT%{l_prefix}/include/php
rm -rf $RPM_BUILD_ROOT%{l_prefix}/lib/php/build
+ rmdir $RPM_BUILD_ROOT%{l_prefix}/lib/php >/dev/null 2>&1 || true
%endif
# optionally install suPHP wrapper binary
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
