SPECS (DEVEL): php4.spec - seems working, somebody please look ; ) ...

[glen]

Author: glen                         Date: Fri Jun 17 14:09:52 2005 GMT
Module: SPECS                         Tag: DEVEL
---- Log message:
- seems working, somebody please look ;) and perhaps comment and fix

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

---- Diffs:

================================================================
Index: SPECS/php4.spec
diff -u SPECS/php4.spec:1.421.2.3.2.20 SPECS/php4.spec:1.421.2.3.2.21
--- SPECS/php4.spec:1.421.2.3.2.20	Thu Jun 16 22:55:05 2005
+++ SPECS/php4.spec	Fri Jun 17 16:09:47 2005
@@ -1799,20 +1799,31 @@
 
 %if %{with apache1}
 #%{__make} libphp4.la -f Makefile.apxs1
+#sed -i -e "
+#s|^libdir=.*|libdir='sapi/apache'|;
+#s|^(relink_command=.* -rpath )[^ ]*/libs |$1sapi/apache |" libphp4.la
+#
+#libtool --silent --mode=install cp libphp4.la `pwd`/sapi/apache
+#rm -f libphp4.la .libs/libphp4.so
+
 %{__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
 
 %if %{with apache2}
 #%{__make} libphp4.la -f Makefile.apxs2
+#libtool --silent --mode=install cp libphp4.la `pwd`/sapi/apache2handler
+#rm -f libphp4.la .libs/libphp4.so
+
 %{__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
@@ -1845,15 +1856,18 @@
 	$RPM_BUILD_ROOT%{_mandir}/man1
 
 # install apache1 DSO module
+# LIBTOOL GURUS COULD LOOK AT THIS MESS AND THROW THEIR GOOD IDEAS HERE
 %if %{with apache1}
+install sapi/apache/.libs/libphp4.so $RPM_BUILD_ROOT%{_libdir}/apache1/libphp4.so
+#libtool --silent --mode=install install sapi/apache/libphp4.la $RPM_BUILD_ROOT%{_libdir}/apache1
 #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 sapi/apache2handler/.libs/libphp4.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
+#libtool --silent --mode=install install sapi/apache2handler/libphp4.la $RPM_BUILD_ROOT%{_libdir}/apache
 %endif
 
 #install .libs/libphp_common.so $RPM_BUILD_ROOT%{_libdir}
@@ -2936,6 +2950,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.421.2.3.2.21  2005/06/17 14:09:47  glen
+- seems working, somebody please look ;) and perhaps comment and fix
+
 Revision 1.421.2.3.2.20  2005/06/16 20:55:05  glen
 - save again
 
================================================================

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