Sophie

Sophie

distrib > Mageia > 1 > i586 > media > core-updates-src > by-pkgid > 2d27fe3dff73e21c1aac97aebe0dff40 > files > 20

rpm-4.8.1-10.5.mga1.src.rpm

From 6ae13455e778545944f38fb5e5c6302268a0db2b Mon Sep 17 00:00:00 2001
From: unknown author <cooker@mandrivalinux.org>
Date: Mon, 5 Jan 2009 13:29:57 +0000
Subject: [PATCH 11/36] read-macros_d-dot-macros

---
 lib/rpmrc.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/lib/rpmrc.c b/lib/rpmrc.c
index ac6ec5c..2fda289 100644
--- a/lib/rpmrc.c
+++ b/lib/rpmrc.c
@@ -427,6 +427,7 @@ static void setDefaults(void)
 	macrofiles = rstrscat(NULL, confdir, "/macros", ":",
 				confdir, "/platform/%{_target}/macros", ":",
   				confdir, "/" RPMCANONVENDOR "/macros", ":",
+				SYSCONFDIR "/rpm/macros.d/*.macros", ":",
 				SYSCONFDIR "/rpm/macros.*", ":",
 				SYSCONFDIR "/rpm/macros", ":",
 				SYSCONFDIR "/rpm/%{_target}/macros", ":",
-- 
1.6.4.4