do not hardcode extension_dir, builtin is correct

diff --git a/php-ini.patch b/php-ini.patch
index eb057deeffde1127af7cf01ca173627a4c782e43..e05f9c11b2d1df94fdaa0282e9921991969ac950 100644 (file)
--- 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 21b82ec2ec1bc7c78a6c85088d0455bc243840de..84f043caa8b56d7e324fe6f7e852e593db3d11fa 100644 (file)
--- 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