diff options
| author | Panu Matilainen <pmatilai@redhat.com> | 2012-11-09 08:21:51 +0200 |
|---|---|---|
| committer | Panu Matilainen <pmatilai@redhat.com> | 2012-11-14 12:37:57 +0200 |
| commit | a4dd60f7fb599646689ca3d92acce129a8591dba (patch) | |
| tree | 702a2b30d058cb44cd2c509af97d47da074df992 /lib | |
| parent | a6b04e778c68f6122549a96391455c2917b36150 (diff) | |
| download | rpm-a4dd60f7fb599646689ca3d92acce129a8591dba.tar.gz rpm-a4dd60f7fb599646689ca3d92acce129a8591dba.tar.bz2 rpm-a4dd60f7fb599646689ca3d92acce129a8591dba.zip | |
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)
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/rpmrc.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/rpmrc.c b/lib/rpmrc.c index 96f05cef6..7638e8114 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", ":", |