From: Elan Ruusamäe Date: Tue, 6 Jan 2009 05:42:32 +0000 (+0000) Subject: - add ruby_rdocdir X-Git-Tag: deadbranch-1.573.2~15 X-Git-Url: http://git.pld-linux.org/?a=commitdiff_plain;h=5fbedd3ef0c9d508523d08fa0a3db5a965501661;p=packages%2Frpm-build-tools.git - add ruby_rdocdir Changed files: adapter.awk -> 1.415 adapter.sh -> 1.33 --- diff --git a/adapter.awk b/adapter.awk index e82e41a..10b1384 100644 --- a/adapter.awk +++ b/adapter.awk @@ -1069,6 +1069,7 @@ function use_macros() gsub(ruby_rubylibdir, "%{ruby_rubylibdir}") gsub(ruby_sitearchdir, "%{ruby_sitearchdir}") gsub(ruby_sitelibdir, "%{ruby_sitelibdir}") + gsub(ruby_rdocdir, "%{ruby_rdocdir}") gsub("%{_datadir}/applications", "%{_desktopdir}") gsub("%{_datadir}/pixmaps", "%{_pixmapsdir}") @@ -1794,6 +1795,7 @@ function import_rpm_macros() { ruby_rubylibdir = ENVIRON["ruby_rubylibdir"] ruby_sitearchdir = ENVIRON["ruby_sitearchdir"] ruby_sitelibdir = ENVIRON["ruby_sitelibdir"] + ruby_rdocdir = ENVIRON["ruby_rdocdir"] php_pear_dir = ENVIRON["php_pear_dir"] php_data_dir = ENVIRON["php_data_dir"] diff --git a/adapter.sh b/adapter.sh index afbcd4f..ffce649 100644 --- a/adapter.sh +++ b/adapter.sh @@ -182,6 +182,7 @@ import_rpm_macros() { ruby_rubylibdir ruby_sitearchdir ruby_sitelibdir + ruby_rdocdir php_pear_dir php_data_dir