RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Per Øyvind Karlsen
Root: /v/rpm/cvs Email: pkarl...@rpm5.org
Module: rpm Date: 20-Dec-2008 03:27:12
Branch: HEAD Handle: 2008122002271200
Modified files:
rpm configure.ac
Log:
add ~/.rpmmacros to MACROFILES after '--with-extra-path-macros=ARG' so that
we're sure that ~/.rpmmacros will always override the other macros
Summary:
Revision Changes Path
2.330 +5 -5 rpm/configure.ac
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/configure.ac
============================================================================
$ cvs diff -u -r2.329 -r2.330 configure.ac
--- rpm/configure.ac 18 Dec 2008 00:01:15 -0000 2.329
+++ rpm/configure.ac 20 Dec 2008 02:27:12 -0000 2.330
@@ -1575,6 +1575,11 @@
MACROFILES="${MACROFILES}:${SYSCONFIGDIR}/macros.*"
MACROFILES="${MACROFILES}:${SYSCONFIGDIR}/macros"
MACROFILES="${MACROFILES}:${SYSCONFIGDIR}/%{_target}/macros"
+AC_ARG_WITH(
+ [extra-path-macros],
+ AS_HELP_STRING([--with-extra-path-macros=ARG], [build with additional
colon-separated RPM macro files path not overriding defaults]),
+ [MACROFILES="$MACROFILES:$withval"]
+)
if test ".$WITH_PATH_VERSIONED" = .yes; then
MACROFILES="${MACROFILES}:~/.rpmmacros-${VERSION}"
else
@@ -1585,11 +1590,6 @@
AS_HELP_STRING([--with-path-macros=ARG], [build with colon-separated RPM
macro files path]),
[MACROFILES="$withval"]
)
-AC_ARG_WITH(
- [extra-path-macros],
- AS_HELP_STRING([--with-extra-path-macros=ARG], [build with additional
colon-separated RPM macro files path not overriding defaults]),
- [MACROFILES="$MACROFILES:$withval"]
-)
AC_DEFINE_UNQUOTED(
[MACROFILES], ["$MACROFILES"],
[Colon separated RPM macro files path]
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
