folkslinux
/
rpm
mirror of https://github.com/rpm-software-management/rpm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Eliminate LIBRPMRC_FILENAME.

This commit is contained in:
Ralf Corsépius 2007-08-28 18:22:11 +02:00
parent 1f89418506
commit 5b8a3cf39b
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
configure.ac
View File

@ -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)])

4
lib/rpmrc.c
View File

@ -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";