SPECS: php4.spec - fix libphp_common.la location for extension bui...

[glen]

Author: glen                         Date: Wed Apr  5 21:14:57 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- fix libphp_common.la location for extension building

---- Files affected:
SPECS:
   php4.spec (1.536 -> 1.537) 

---- Diffs:

================================================================
Index: SPECS/php4.spec
diff -u SPECS/php4.spec:1.536 SPECS/php4.spec:1.537
--- SPECS/php4.spec:1.536	Wed Apr  5 18:14:11 2006
+++ SPECS/php4.spec	Wed Apr  5 23:14:52 2006
@@ -71,7 +71,7 @@
 %undefine	with_msession
 %endif
 
-%define	_rel 9.19
+%define	_rel 9.22
 Summary:	PHP: Hypertext Preprocessor
 Summary(fr):	Le langage de script embarque-HTML PHP
 Summary(pl):	Język skryptowy PHP
@@ -1900,6 +1900,10 @@
 	$RPM_BUILD_ROOT{/etc/apache/conf.d,/etc/httpd/httpd.conf} \
 	$RPM_BUILD_ROOT%{_mandir}/man1
 
+# install the apache modules' files
+%{__make} install-headers install-build install-modules install-programs \
+	INSTALL_ROOT=$RPM_BUILD_ROOT
+
 # install apache1 DSO module
 %if %{with apache1}
 sed -i -e "s|^libdir=.*|libdir='%{_libdir}/apache1'|" sapi/apache/libphp4.la
@@ -1919,10 +1923,8 @@
 libtool --silent --mode=install install libphp_common.la $RPM_BUILD_ROOT%{_libdir}
 # fix install paths, avoid evil rpaths
 sed -i -e "s|^libdir=.*|libdir='%{_libdir}'|" $RPM_BUILD_ROOT%{_libdir}/libphp_common.la
-
-# install the apache modules' files
-%{__make} install-headers install-build install-modules install-programs \
-	INSTALL_ROOT=$RPM_BUILD_ROOT
+# better solution?
+sed -i -e 's|libphp_common.la|$(libdir)/libphp_common.la|' $RPM_BUILD_ROOT%{_libdir}/php/build/acinclude.m4
 
 # install CGI
 libtool --silent --mode=install install sapi/cgi/php $RPM_BUILD_ROOT%{_bindir}/php4.cgi
@@ -3225,6 +3227,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.537  2006/04/05 21:14:52  glen
+- fix libphp_common.la location for extension building
+
 Revision 1.536  2006/04/05 16:14:11  glen
 - build cleanups, use permanent config.cache if configured
 
================================================================

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