RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Anders F. Björklund
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm Date: 13-Apr-2008 20:50:34
Branch: HEAD Handle: 2008041318503202
Modified files:
rpm CHANGES Makefile.am
rpm/build Makefile.am
rpm/lib Makefile.am
rpm/rpmconstant Makefile.am
rpm/rpmdb Makefile.am
rpm/rpmio Makefile.am
Log:
fix VPATH builds too (rpmversion.h)
Summary:
Revision Changes Path
1.2297 +1 -0 rpm/CHANGES
2.216 +1 -0 rpm/Makefile.am
2.71 +1 -0 rpm/build/Makefile.am
2.178 +1 -0 rpm/lib/Makefile.am
1.10 +2 -1 rpm/rpmconstant/Makefile.am
1.95 +1 -0 rpm/rpmdb/Makefile.am
1.166 +1 -0 rpm/rpmio/Makefile.am
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.2296 -r1.2297 CHANGES
--- rpm/CHANGES 13 Apr 2008 18:16:30 -0000 1.2296
+++ rpm/CHANGES 13 Apr 2008 18:50:32 -0000 1.2297
@@ -1,5 +1,6 @@
5.1b1 -> 5.2b1:
+ - afb: fix VPATH builds finding rpmversion.h (in build)
- afb: fix parallel build of rpmdigest (automake quirk)
- afb: disable intl/iconv for popt 1.14 under Mac OS X
- jbj: update {nl,pl,sl,sv,vi}.po from Translation Project.
@@ .
patch -p0 <<'@@ .'
Index: rpm/Makefile.am
============================================================================
$ cvs diff -u -r2.215 -r2.216 Makefile.am
--- rpm/Makefile.am 27 Feb 2008 06:56:28 -0000 2.215
+++ rpm/Makefile.am 13 Apr 2008 18:50:32 -0000 2.216
@@ -66,6 +66,7 @@
-I$(top_srcdir) \
-I$(top_srcdir)/build \
-I$(top_srcdir)/lib \
+ -I$(top_builddir)/lib \
-I$(top_srcdir)/rpmdb \
-I$(top_srcdir)/rpmio \
-I$(top_srcdir)/misc \
@@ .
patch -p0 <<'@@ .'
Index: rpm/build/Makefile.am
============================================================================
$ cvs diff -u -r2.70 -r2.71 Makefile.am
--- rpm/build/Makefile.am 11 Nov 2007 15:05:18 -0000 2.70
+++ rpm/build/Makefile.am 13 Apr 2008 18:50:33 -0000 2.71
@@ -11,6 +11,7 @@
-I$(top_srcdir) \
-I$(top_srcdir)/build \
-I$(top_srcdir)/lib \
+ -I$(top_builddir)/lib \
-I$(top_srcdir)/rpmdb \
-I$(top_srcdir)/rpmio \
-I$(top_srcdir)/misc \
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/Makefile.am
============================================================================
$ cvs diff -u -r2.177 -r2.178 Makefile.am
--- rpm/lib/Makefile.am 11 Mar 2008 14:49:52 -0000 2.177
+++ rpm/lib/Makefile.am 13 Apr 2008 18:50:33 -0000 2.178
@@ -9,6 +9,7 @@
-I$(top_srcdir) \
-I$(top_srcdir)/build \
-I$(top_srcdir)/lib \
+ -I$(top_builddir)/lib \
-I$(top_srcdir)/rpmdb \
-I$(top_srcdir)/rpmio \
-I$(top_srcdir)/misc \
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmconstant/Makefile.am
============================================================================
$ cvs diff -u -r1.9 -r1.10 Makefile.am
--- rpm/rpmconstant/Makefile.am 27 Dec 2007 10:30:54 -0000 1.9
+++ rpm/rpmconstant/Makefile.am 13 Apr 2008 18:50:33 -0000 1.10
@@ -1,4 +1,4 @@
-# $Id: Makefile.am,v 1.9 2007/12/27 10:30:54 afb Exp $
+# $Id: Makefile.am,v 1.10 2008/04/13 18:50:33 afb Exp $
AUTOMAKE_OPTIONS = 1.4 foreign
@@ -11,6 +11,7 @@
-I$(top_srcdir) \
-I$(top_srcdir)/build \
-I$(top_srcdir)/lib \
+ -I$(top_builddir)/lib \
-I$(top_srcdir)/rpmdb \
-I$(top_srcdir)/rpmio \
-I$(top_srcdir)/misc \
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/Makefile.am
============================================================================
$ cvs diff -u -r1.94 -r1.95 Makefile.am
--- rpm/rpmdb/Makefile.am 1 Dec 2007 17:49:30 -0000 1.94
+++ rpm/rpmdb/Makefile.am 13 Apr 2008 18:50:33 -0000 1.95
@@ -9,6 +9,7 @@
-I$(top_srcdir) \
-I$(top_srcdir)/build \
-I$(top_srcdir)/lib \
+ -I$(top_builddir)/lib \
-I$(top_srcdir)/rpmdb \
-I$(top_srcdir)/rpmio \
-I$(top_srcdir)/misc \
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/Makefile.am
============================================================================
$ cvs diff -u -r1.165 -r1.166 Makefile.am
--- rpm/rpmio/Makefile.am 13 Apr 2008 18:16:30 -0000 1.165
+++ rpm/rpmio/Makefile.am 13 Apr 2008 18:50:34 -0000 1.166
@@ -31,6 +31,7 @@
-I$(top_srcdir) \
-I$(top_srcdir)/build \
-I$(top_srcdir)/lib \
+ -I$(top_builddir)/lib \
-I$(top_srcdir)/rpmdb \
-I$(top_srcdir)/rpmio \
-I$(top_srcdir)/misc \
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
