SOURCES (AC-branch): rpm.macros, rpm.macros - use php includedir m...

[glen]

Author: glen                         Date: Fri Oct 28 09:45:25 2005 GMT
Module: SOURCES                       Tag: AC-branch
---- Log message:
- use php includedir macro

---- Files affected:
SOURCES:
   rpm.macros (1.158.4.73 -> 1.158.4.74) 
SOURCES:
   rpm.macros (1.251 -> 1.252) 

---- Diffs:

================================================================
Index: SOURCES/rpm.macros
diff -u SOURCES/rpm.macros:1.158.4.73 SOURCES/rpm.macros:1.158.4.74
--- SOURCES/rpm.macros:1.158.4.73	Fri Oct 28 09:16:40 2005
+++ SOURCES/rpm.macros	Fri Oct 28 11:45:20 2005
@@ -482,7 +482,7 @@
 %php_debug				%(awk '/#define ZEND_DEBUG/{print $3}' %{__php_includedir}/main/php_config.h 2>/dev/null || echo ERROR)
 %zend_module_api		%(awk '/#define ZEND_MODULE_API_NO/{print $3}' %{__php_includedir}/Zend/zend_modules.h 2>/dev/null || echo ERROR)
 %zend_extension_api		%(awk '/#define ZEND_EXTENSION_API_NO/{print $3}' %{__php_includedir}/Zend/zend_extensions.h 2>/dev/null || echo ERROR)
-%zend_zts				%(Z=$(grep -sc '^#define ZTS 1' /usr/include/php/main/php_config.h); echo ${Z:-ERROR})
+%zend_zts				%(Z=$(grep -sc '^#define ZTS 1' %{__php_includedir}/main/php_config.h); echo ${Z:-ERROR})
 
 # helper macro
 %__php_api_requires() Requires: php(%{expand:%1}) = %{expand:%{%{!?2:%{1}}%{?2}}}

================================================================
Index: SOURCES/rpm.macros
diff -u SOURCES/rpm.macros:1.251 SOURCES/rpm.macros:1.252
--- SOURCES/rpm.macros:1.251	Fri Oct 28 09:16:40 2005
+++ SOURCES/rpm.macros	Fri Oct 28 11:45:20 2005
@@ -483,7 +483,7 @@
 %php_debug				%(awk '/#define ZEND_DEBUG/{print $3}' %{__php_includedir}/main/php_config.h 2>/dev/null || echo ERROR)
 %zend_module_api		%(awk '/#define ZEND_MODULE_API_NO/{print $3}' %{__php_includedir}/Zend/zend_modules.h 2>/dev/null || echo ERROR)
 %zend_extension_api		%(awk '/#define ZEND_EXTENSION_API_NO/{print $3}' %{__php_includedir}/Zend/zend_extensions.h 2>/dev/null || echo ERROR)
-%zend_zts				%(Z=$(grep -sc '^#define ZTS 1' /usr/include/php/main/php_config.h); echo ${Z:-ERROR})
+%zend_zts				%(Z=$(grep -sc '^#define ZTS 1' %{__php_includedir}/main/php_config.h); echo ${Z:-ERROR})
 
 # helper macro
 %__php_api_requires() Requires: php(%{expand:%1}) = %{expand:%{%{!?2:%{1}}%{?2}}}
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/rpm.macros?r1=1.158.4.73&r2=1.158.4.74&f=u
    http://cvs.pld-linux.org/SOURCES/rpm.macros?r1=1.251&r2=1.252&f=u