[packages/php/PHP_5_4] do not hardcode extension_dir, builtin is correct

glen glen at pld-linux.org
Tue Jul 31 07:00:35 CEST 2012


commit 91ccfdbdb4065ee47c979a51b77155d055ef44e7
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Tue Jul 31 07:38:23 2012 +0300

    do not hardcode extension_dir, builtin is correct

 php-ini.patch | 2 +-
 php.spec      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/php-ini.patch b/php-ini.patch
index eb057de..e05f9c1 100644
--- a/php-ini.patch
+++ b/php-ini.patch
@@ -23,7 +23,7 @@
  ; Directory in which the loadable extensions (modules) reside.
  ; http://php.net/extension-dir
 -; extension_dir = "./"
-+extension_dir = "/usr/lib/php"
++;extension_dir = "/usr/lib/php"
  ; On windows:
  ; extension_dir = "ext"
  
diff --git a/php.spec b/php.spec
index 21b82ec..84f043c 100644
--- a/php.spec
+++ b/php.spec
@@ -2422,7 +2422,7 @@ cp -p sapi/cli/php.1 $RPM_BUILD_ROOT%{_mandir}/man1/php.1
 echo ".so php.1" >$RPM_BUILD_ROOT%{_mandir}/man1/php.cli.1
 ln -sf php.cli $RPM_BUILD_ROOT%{_bindir}/php
 
-sed -e 's#%{_prefix}/lib/php#%{_libdir}/php#g' php.ini > $RPM_BUILD_ROOT%{_sysconfdir}/php.ini
+sed -e 's#%{_prefix}/lib/php#%{php_extensiondir}#g' php.ini > $RPM_BUILD_ROOT%{_sysconfdir}/php.ini
 
 cp -p %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/php-cli.ini
 cp -p %{SOURCE9} $RPM_BUILD_ROOT%{_sysconfdir}/browscap.ini


More information about the pld-cvs-commit mailing list