commit 6f2c1099a7b06980da1cf89bcb0c593a67aabbec
Author: Elan Ruusamäe <[email protected]>
Date: Tue Sep 12 14:57:39 2006 +0000
- ruby macros expansion
Changed files:
adapter.awk -> 1.326
adapter.awk | 14 ++++++++++++++
1 file changed, 14 insertions(+)
---
diff --git a/adapter.awk b/adapter.awk
index ba90c86..ca51066 100644
--- a/adapter.awk
+++ b/adapter.awk
@@ -85,6 +85,13 @@ BEGIN {
"rpm --eval %py_sitescriptdir" | getline py_sitescriptdir
"rpm --eval %py_sitedir" | getline py_sitedir
"rpm --eval %py_scriptdir " | getline py_scriptdir
+
+ "rpm --eval %ruby_archdir" | getline ruby_archdir
+ "rpm --eval %ruby_ridir" | getline ruby_ridir
+ "rpm --eval %ruby_rubylibdir" | getline ruby_rubylibdir
+ "rpm --eval %ruby_sitearchdir" | getline ruby_sitearchdir
+ "rpm --eval %ruby_sitelibdir" | getline ruby_sitelibdir
+
"rpm --eval %php_pear_dir" | getline php_pear_dir
"rpm --eval %tmpdir" | getline tmpdir
}
@@ -1071,6 +1078,13 @@ function use_macros()
gsub(py_scriptdir, "%{py_scriptdir}")
gsub("%{_libdir}/python2.4/site-packages", "%{py_sitedir}")
gsub("%{python_sitelib}", "%{py_sitedir}")
+
+ gsub(ruby_archdir, "%{ruby_archdir}")
+ gsub(ruby_ridir, "%{ruby_ridir}")
+ gsub(ruby_rubylibdir, "%{ruby_rubylibdir}")
+ gsub(ruby_sitearchdir, "%{ruby_sitearchdir}")
+ gsub(ruby_sitelibdir, "%{ruby_sitelibdir}")
+
gsub("%{_datadir}/applications", "%{_desktopdir}")
gsub("%{_datadir}/pixmaps", "%{_pixmapsdir}")
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/adapter.git/commitdiff/6ca0126d4d0c8c79feb7db10b0a0fade0f3b8885
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
