OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 01-Jun-2007 22:45:13
Branch: HEAD Handle: 2007060121451200
Modified files:
openpkg-src/php php.spec
Log:
install CGI under cgi/php and not cgi/php-cgi and simplify the
installation procedure now that the upstream vendor has already fixed
it
Summary:
Revision Changes Path
1.157 +3 -13 openpkg-src/php/php.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/php/php.spec
============================================================================
$ cvs diff -u -r1.156 -r1.157 php.spec
--- openpkg-src/php/php.spec 1 Jun 2007 17:25:57 -0000 1.156
+++ openpkg-src/php/php.spec 1 Jun 2007 20:45:12 -0000 1.157
@@ -518,21 +518,11 @@
rm -rf $RPM_BUILD_ROOT
%{l_make} %{l_mflags} install INSTALL_ROOT=$RPM_BUILD_ROOT
- # install CLI version
- # ("make install" incorrectly installs the CGI version into bin/php!)
- %{l_shtool} mkdir -f -p -m 755 \
- $RPM_BUILD_ROOT%{l_prefix}/bin \
- $RPM_BUILD_ROOT%{l_prefix}/man/man1
- %{l_shtool} install -c -s -m 755 \
- sapi/cli/php $RPM_BUILD_ROOT%{l_prefix}/bin/
- %{l_shtool} install -c -m 644 \
- sapi/cli/php.1 $RPM_BUILD_ROOT%{l_prefix}/man/man1/
-
- # (re)install CGI version
+ # move CGI executale
%{l_shtool} mkdir -f -p -m 755 \
$RPM_BUILD_ROOT%{l_prefix}/cgi
- %{l_shtool} install -c -s -m 755 \
- sapi/cgi/php-cgi $RPM_BUILD_ROOT%{l_prefix}/cgi/
+ mv $RPM_BUILD_ROOT%{l_prefix}/bin/php-cgi \
+ $RPM_BUILD_ROOT%{l_prefix}/cgi/php
# install default configuration file
%{l_shtool} mkdir -f -p -m 755 \
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
