- added *vendor* dirs and use of the __perl macro (with fallback if not defined)

Changed files:
    rpm-macros.perl -> 1.1.8.1

diff --git a/rpm-macros.perl b/rpm-macros.perl
index 226878c660d5d051f0770f5a92543b49556aa27d..d5668c981e36a3afc7b92f8ebfe1c57a44c4c8c7 100644 (file)
--- a/rpm-macros.perl
+++ b/rpm-macros.perl
@@ -5,8 +5,14 @@
 %define                __find_requires @RPMCONFIGDIR@/find-perl-requires
 %define                __find_provides @RPMCONFIGDIR@/find-perl-provides
 
-%define                perl_sitelib    %(eval "`perl -V:installsitelib`"; echo $installsitelib)
-%define                perl_sitearch   %(eval "`perl -V:installsitearch`"; echo $installsitearch)
-%define                perl_archlib    %(eval "`perl -V:installarchlib`"; echo $installarchlib)
-%define                perl_privlib    %(eval "`perl -V:installprivlib`"; echo $installprivlib)
+%define                perl_privlib    %(eval "`%{__perl} -V:installprivlib`"; echo $installprivlib)
+%define                perl_archlib    %(eval "`%{__perl} -V:installarchlib`"; echo $installarchlib)
+%define                perl_vendorlib  %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)
+%define                perl_vendorarch %(eval "`%{__perl} -V:installvendorarch`"; echo $installvendorarch)
+%define                perl_sitelib    %(eval "`%{__perl} -V:installsitelib`"; echo $installsitelib)
+%define                perl_sitearch   %(eval "`%{__perl} -V:installsitearch`"; echo $installsitearch)
+
+# fallback for Ra, where installvendor* are undefined by default
+%{!?perl_vendorlib:%define     perl_vendorlib  %{perl_sitelib}}
+%{!?perl_vendorarch:%define    perl_vendorarch %{perl_sitearch}}