From a4dd60f7fb599646689ca3d92acce129a8591dba Mon Sep 17 00:00:00 2001 From: Panu Matilainen Date: Fri, 9 Nov 2012 08:21:51 +0200 Subject: [PATCH] Add $RPM_CONFIGDIR/macros.d/ directory to default macro path (RhBug:846679) - There of course already is a drop-in directory for macro config bits in $(sysconfdir)/rpm/ but as /etc is supposed to be per-host admin territory, having another place for system package provided rpm config doesn't seem unreasonable. - Whether this early in the path is the best possible or even reasonable position for this remains to be seen... but this way it could be used for "factory default" config bits by rpm itself as well, while still permitting vendor/host/user override. (cherry picked from commit dcd261b9fe1e61e8ac3e99dbb443145bbf896886) --- lib/rpmrc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/rpmrc.c b/lib/rpmrc.c index 96f05ce..7638e81 100644 --- a/lib/rpmrc.c +++ b/lib/rpmrc.c @@ -437,6 +437,7 @@ static void setDefaults(void) #ifndef MACROFILES if (!macrofiles) { macrofiles = rstrscat(NULL, confdir, "/macros", ":", + confdir, "/macros.d/macros.*", ":", confdir, "/platform/%{_target}/macros", ":", confdir, "/fileattrs/*.attr", ":", confdir, "/" RPMCANONVENDOR "/macros", ":", -- 2.7.4