summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjbj <devnull@localhost>2004-04-08 00:12:01 +0000
committerjbj <devnull@localhost>2004-04-08 00:12:01 +0000
commit66f860d94fa9b33f4abfcc41ea2267bd2660c613 (patch)
treeb9b22edb6fc3025e26740b93816ed386a0fe43a1
parent2e491f5fcf77f7b61d2ab96e095bd72b95d544c4 (diff)
downloadlibrpm-tizen-66f860d94fa9b33f4abfcc41ea2267bd2660c613.tar.gz
librpm-tizen-66f860d94fa9b33f4abfcc41ea2267bd2660c613.tar.bz2
librpm-tizen-66f860d94fa9b33f4abfcc41ea2267bd2660c613.zip
- perl: use __perl for perl variable macros (#115156).
CVS patchset: 7229 CVS date: 2004/04/08 00:12:01
-rw-r--r--CHANGES1
-rw-r--r--macros.in14
2 files changed, 8 insertions, 7 deletions
diff --git a/CHANGES b/CHANGES
index 0d2628f73..6f7f84558 100644
--- a/CHANGES
+++ b/CHANGES
@@ -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.
diff --git a/macros.in b/macros.in
index 6aa3f9726..8a1737db1 100644
--- a/macros.in
+++ b/macros.in
@@ -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