Read vendor macros again.

- replace VENDORRPMRC_FILENAME with VENDORCONFIGDIR
- use it to locate both vendor rpmrc and macros

diff --git a/configure.ac b/configure.ac
index e9e8d4b..562bb38 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -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)
 

diff --git a/lib/rpmrc.c b/lib/rpmrc.c
index 32b6e32..a865110 100644 (file)
--- a/lib/rpmrc.c
+++ b/lib/rpmrc.c
@@ -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"