RPM Package Manager, CVS Repository http://rpm5.org/cvs/ ____________________________________________________________________________
Server: rpm5.org Name: Olivier Thauvin Root: /v/rpm/cvs Email: [EMAIL PROTECTED] Module: rpm Date: 21-Jun-2007 15:05:48 Branch: rpm-4_5 Handle: 2007062114054800 Modified files: (Branch: rpm-4_5) rpm configure.ac Log: - readd vendor macros file in default list Summary: Revision Changes Path 2.70.2.14 +1 -1 rpm/configure.ac ____________________________________________________________________________ patch -p0 <<'@@ .' Index: rpm/configure.ac ============================================================================ $ cvs diff -u -r2.70.2.13 -r2.70.2.14 configure.ac --- rpm/configure.ac 16 Jun 2007 23:07:07 -0000 2.70.2.13 +++ rpm/configure.ac 21 Jun 2007 13:05:48 -0000 2.70.2.14 @@ -1480,7 +1480,7 @@ [Full path to rpm system configuration directory (usually /etc/rpm)]) AC_SUBST(SYSCONFIGDIR) -MACROFILES="${USRLIBRPM}/${VERSION}/macros:${USRLIBRPM}/%{_target}/macros:${SYSCONFIGDIR}/macros.*:${SYSCONFIGDIR}/macros:${SYSCONFIGDIR}/%{_target}/macros:~/.rpmmacros" +MACROFILES="${USRLIBRPM}/${VERSION}/macros:${USRLIBRPM}/%{_target}/macros:${SYSCONFIGDIR}/%{_host_vendor}/macros:${SYSCONFIGDIR}/%{_host_vendor}/%{_target}/macros:${SYSCONFIGDIR}/macros.*:${SYSCONFIGDIR}/macros.d/*.macros:${SYSCONFIGDIR}/macros:${SYSCONFIGDIR}/%{_target}/macros:~/.rpmmacros" AC_DEFINE_UNQUOTED(MACROFILES, "$MACROFILES", [Colon separated paths of macro files to read.]) AC_SUBST(MACROFILES) @@ . ______________________________________________________________________ RPM Package Manager http://rpm5.org CVS Sources Repository rpm-cvs@rpm5.org