SPECS (DEVEL): php4.spec - save again

[glen]

Author: glen                         Date: Thu Jun 16 20:55:10 2005 GMT
Module: SPECS                         Tag: DEVEL
---- Log message:
- save again

---- Files affected:
SPECS:
   php4.spec (1.421.2.3.2.19 -> 1.421.2.3.2.20) 

---- Diffs:

================================================================
Index: SPECS/php4.spec
diff -u SPECS/php4.spec:1.421.2.3.2.19 SPECS/php4.spec:1.421.2.3.2.20
--- SPECS/php4.spec:1.421.2.3.2.19	Thu Jun 16 22:48:03 2005
+++ SPECS/php4.spec	Thu Jun 16 22:55:05 2005
@@ -1657,6 +1657,8 @@
 CFLAGS="$CFLAGS $(%{_bindir}/apr-1-config --cppflags --includes) $(%{_bindir}/apu-1-config --includes)"
 
 for sapi in $sapis; do
+	[ -f Makefile.$sapi ] && continue
+
 	%configure \
 	`
 	case $sapi in
@@ -1798,6 +1800,9 @@
 %if %{with apache1}
 #%{__make} libphp4.la -f Makefile.apxs1
 %{__make} sapi/apache/libphp4.la -f Makefile.apxs1
+sed -i -e "
+s|^libdir=.*|libdir='%{_libdir}/apache1'|;
+s|^(relink_command=.* -rpath )[^ ]*/libs |$1%{_libdir}/apache1 |" sapi/apache/libphp4.la
 #mv .libs/libphp4.so libphp4-apxs1.so
 #rm -f libphp4.la
 %endif
@@ -1805,6 +1810,9 @@
 %if %{with apache2}
 #%{__make} libphp4.la -f Makefile.apxs2
 %{__make} sapi/apache2handler/libphp4.la -f Makefile.apxs2
+sed -i -e "
+s|^libdir=.*|libdir='%{_libdir}/apache'|;
+s|^(relink_command=.* -rpath )[^ ]*/libs |$1%{_libdir}/apache |" sapi/apache2handler/libphp4.la
 #mv -f .libs/libphp4.so libphp4-apxs2.so
 #rm -f libphp4.la
 %endif
@@ -1838,12 +1846,14 @@
 
 # install apache1 DSO module
 %if %{with apache1}
-install libphp4-apxs1.so $RPM_BUILD_ROOT%{_libdir}/apache1/libphp4.so
+#install libphp4-apxs1.so $RPM_BUILD_ROOT%{_libdir}/apache1/libphp4.so
+libtool --silent --mode=install install sapi/apache/libphp4.la $RPM_BUILD_ROOT%{_libdir}/apache1
 %endif
 
 # install apache2 DSO module
 %if %{with apache2}
-install libphp4-apxs2.so $RPM_BUILD_ROOT%{_libdir}/apache/libphp4.so
+#install libphp4-apxs2.so $RPM_BUILD_ROOT%{_libdir}/apache/libphp4.so
+libtool --silent --mode=install install sapi/apache2handler/libphp4.la $RPM_BUILD_ROOT%{_libdir}/apache
 %endif
 
 #install .libs/libphp_common.so $RPM_BUILD_ROOT%{_libdir}
@@ -2926,6 +2936,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.421.2.3.2.20  2005/06/16 20:55:05  glen
+- save again
+
 Revision 1.421.2.3.2.19  2005/06/16 20:48:03  glen
 - restore lost lines
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/php4.spec?r1=1.421.2.3.2.19&r2=1.421.2.3.2.20&f=u