From 5b8a3cf39b723d792fcdc00999746a45e342325a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ralf=20Cors=C3=A9pius?= Date: Tue, 28 Aug 2007 18:22:11 +0200 Subject: [PATCH] Eliminate LIBRPMRC_FILENAME. --- configure.ac | 5 ----- lib/rpmrc.c | 4 +++- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/configure.ac b/configure.ac index 733e832e7..6cc52653e 100644 --- a/configure.ac +++ b/configure.ac @@ -1119,11 +1119,6 @@ AC_DEFINE_UNQUOTED(RPMCONFIGDIR, "$RPMCONFIGDIR", [Full path to rpm global configuration directory (usually /usr/lib/rpm)]) AC_SUBST(RPMCONFIGDIR) -LIBRPMRC_FILENAME="${RPMCONFIGDIR}/rpmrc" -AC_DEFINE_UNQUOTED(LIBRPMRC_FILENAME, "$LIBRPMRC_FILENAME", - [Full path to rpmrc configuration file (usually /usr/lib/rpm/rpmrc)]) -AC_SUBST(LIBRPMRC_FILENAME) - VENDORRPMRC_FILENAME="${RPMCONFIGDIR}/${RPMCANONVENDOR}/rpmrc" AC_DEFINE_UNQUOTED(VENDORRPMRC_FILENAME, "$VENDORRPMRC_FILENAME", [Full path to vendor rpmrc configuration file (usually /usr/lib/rpm/vendor/rpmrc)]) diff --git a/lib/rpmrc.c b/lib/rpmrc.c index 85e69884a..beca93769 100644 --- a/lib/rpmrc.c +++ b/lib/rpmrc.c @@ -23,7 +23,9 @@ #include "debug.h" /*@observer@*/ /*@unchecked@*/ -static const char *defrcfiles = LIBRPMRC_FILENAME ":" VENDORRPMRC_FILENAME +static const char *defrcfiles = + RPMCONFIGDIR "/rpmrc" + ":" VENDORRPMRC_FILENAME ":" SYSCONFDIR "/rpmrc" ":~/.rpmrc";