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

Read vendor macros again. 

- replace VENDORRPMRC_FILENAME with VENDORCONFIGDIR
- use it to locate both vendor rpmrc and macros
This commit is contained in:
Panu Matilainen 2007-09-03 22:39:26 +03:00
parent 1535dc8bb7
commit ffea910c37
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
configure.ac
View File

@ -1088,10 +1088,10 @@ AC_DEFINE_UNQUOTED(RPMCONFIGDIR, "$RPMCONFIGDIR",
[Full path to rpm global configuration directory (usually /usr/lib/rpm)])
AC_SUBST(RPMCONFIGDIR)
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)])
AC_SUBST(VENDORRPMRC_FILENAME)
VENDORCONFIGDIR="${RPMCONFIGDIR}/${RPMCANONVENDOR}"
AC_DEFINE_UNQUOTED(VENDORCONFIGDIR, "$VENDORCONFIGDIR",
[Full path to vendor rpm configuration directory (usually /usr/lib/rpm/vendor/)])
AC_SUBST(VENDORCONFIGDIR)
AC_SUBST(OBJDUMP)

3
lib/rpmrc.c
View File

@ -25,7 +25,7 @@
/*@observer@*/ /*@unchecked@*/
static const char *defrcfiles =
RPMCONFIGDIR "/rpmrc"
":" VENDORRPMRC_FILENAME
":" VENDORCONFIGDIR "/rpmrc"
":" SYSCONFDIR "/rpmrc"
":~/.rpmrc";
@ -34,6 +34,7 @@ const char * macrofiles =
#ifndef MACROFILES
RPMCONFIGDIR "/macros"
":" RPMCONFIGDIR "/%{_target}/macros"
":" VENDORCONFIGDIR "/macros"
":" SYSCONFDIR "/rpm/macros.*"
":" SYSCONFDIR "/rpm/macros"
":" SYSCONFDIR "/rpm/%{_target}/macros"