Eliminate LIBRPMRC_FILENAME.

diff --git a/configure.ac b/configure.ac
index 733e832..6cc5265 100644 (file)
--- 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 85e6988..beca937 100644 (file)
--- 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";