diff options
| -rw-r--r-- | CHANGES | 1 | ||||
| -rw-r--r-- | macros.in | 14 |
2 files changed, 8 insertions, 7 deletions
@@ -13,6 +13,7 @@ - fix: /etc/security/selinux/file_contexts is default path. - fix: no transaction lock if --test was specified (#119783). - perl: skip new-fangled head[34] while generating deps (#118243). + - perl: use __perl for perl variable macros (#115156). 4.2.2 -> 4.3: - upgrade to zlib-1.2.beta7. @@ -1,7 +1,7 @@ #/*! \page config_macros Default configuration: @RPMCONFIGDIR@/macros # \verbatim # -# $Id: macros.in,v 1.148 2004/03/28 02:41:32 arekm Exp $ +# $Id: macros.in,v 1.149 2004/04/08 00:12:01 jbj Exp $ # # This is a global RPM configuration file. All changes made here will # be lost when the rpm package is upgraded. Any per-system configuration @@ -1111,12 +1111,12 @@ done \ # %dir %{perl_sitearch}/auto/Image # %requires_eq() %(LC_ALL="C" echo '%*' | xargs -r rpm -q --qf 'Requires: %%{name} = %%{epoch}:%%{version}\\n' | sed -e 's/ (none):/ /' -e 's/ 0:/ /' | grep -v "is not") -%perl_sitearch %(eval "`perl -V:installsitearch`"; echo $installsitearch) -%perl_sitelib %(eval "`perl -V:installsitelib`"; echo $installsitelib) -%perl_vendorarch %(eval "`perl -V:installvendorarch`"; echo $installvendorarch) -%perl_vendorlib %(eval "`perl -V:installvendorlib`"; echo $installvendorlib) -%perl_archlib %(eval "`perl -V:installarchlib`"; echo $installarchlib) -%perl_privlib %(eval "`perl -V:installprivlib`"; echo $installprivlib) +%perl_sitearch %(eval "`%{__perl} -V:installsitearch`"; echo $installsitearch) +%perl_sitelib %(eval "`%{__perl} -V:installsitelib`"; echo $installsitelib) +%perl_vendorarch %(eval "`%{__perl} -V:installvendorarch`"; echo $installvendorarch) +%perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib) +%perl_archlib %(eval "`%{__perl} -V:installarchlib`"; echo $installarchlib) +%perl_privlib %(eval "`%{__perl} -V:installprivlib`"; echo $installprivlib) #------------------------------------------------------------------------------ # arch macro for all Intel i?86 compatibile processors |