From 7ccf76434c66c07c4ab4a45ba86036853b4cb67b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Elan=20Ruusam=C3=A4e?= Date: Wed, 27 Sep 2006 20:00:46 +0000 Subject: [PATCH] - %php_pear_dir should be constant Changed files: rpm.macros -> 1.320 --- rpm.macros | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/rpm.macros b/rpm.macros index 1bd798d..731279e 100644 --- a/rpm.macros +++ b/rpm.macros @@ -496,7 +496,7 @@ fi \ # Ruby %ruby_archdir %(ruby -r rbconfig -e 'print Config::CONFIG["archdir"]' 2>/dev/null || echo ERROR) -%ruby_ridir %(ruby -r rbconfig -e 'include Config; print File.join(CONFIG["datadir"], "ri", CONFIG["ruby_version"], "system")' 2>/dev/null || echo ERROR) +%ruby_ridir %(ruby -r rbconfig -e 'include Config; print File.join(CONFIG["datadir"], "ri", CONFIG["ruby_version"], "system")' 2>/dev/null || echo ERROR) %ruby_rubylibdir %(ruby -r rbconfig -e 'print Config::CONFIG["rubylibdir"]' 2>/dev/null || echo ERROR) %ruby_sitearchdir %(ruby -r rbconfig -e 'print Config::CONFIG["sitearchdir"]' 2>/dev/null || echo ERROR) %ruby_sitelibdir %(ruby -r rbconfig -e 'print Config::CONFIG["sitelibdir"]' 2>/dev/null || echo ERROR) @@ -504,7 +504,7 @@ fi \ %ruby_ver_requires_eq Requires: ruby(ver) = %ruby_version %ruby_mod_ver_requires_eq Requires: ruby-modules(ver) = %ruby_version -%php_pear_dir %{_datadir}/pear +%php_pear_dir /usr/share/pear # directory where php includes are installed on system. %__php_includedir /usr/include/php @@ -537,14 +537,14 @@ fi \ # Python specific macro definitions. # python main version -%py_ver %(python -c "import sys; print sys.version[:3]") +%py_ver %(python -c "import sys; print sys.version[:3]") # directories %py_prefix %(python -c "import sys; print sys.prefix") %py_libdir %{py_prefix}/%{_lib}/python%{py_ver} %py_scriptdir %{py_prefix}/share/python%{py_ver} %py_incdir /usr/include/python%{py_ver} -%py_sitedir %{py_libdir}/site-packages +%py_sitedir %{py_libdir}/site-packages %py_sitescriptdir %{py_scriptdir}/site-packages %py_dyndir %{py_libdir}/lib-dynload -- 2.44.0