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: 16-Apr-2008 19:58:26
Branch: rpm-5_1 Handle: 2008041617582402
Modified files: (Branch: rpm-5_1)
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 (backported)
Summary:
Revision Changes Path
1.2288.2.13 +1 -0 rpm/CHANGES
2.215.2.1 +1 -0 rpm/Makefile.am
2.70.4.1 +1 -0 rpm/build/Makefile.am
2.177.2.1 +1 -0 rpm/lib/Makefile.am
1.9.4.1 +2 -1 rpm/rpmconstant/Makefile.am
1.94.4.1 +1 -0 rpm/rpmdb/Makefile.am
1.162.2.2 +1 -0 rpm/rpmio/Makefile.am
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.2288.2.12 -r1.2288.2.13 CHANGES
--- rpm/CHANGES 16 Apr 2008 17:54:50 -0000 1.2288.2.12
+++ rpm/CHANGES 16 Apr 2008 17:58:24 -0000 1.2288.2.13
@@ -1,5 +1,6 @@
5.1.0 -> 5.1.1:
+ - afb: fix VPATH builds finding rpmversion.h (in build)
- afb: fix parallel build of rpmdigest (automake quirk)
- jbj: rpmte: revert to individual tags instead of RPMTAG_NVRA.
- afb: macosx: fix thinko in previous xar linking workaround
@@ .
patch -p0 <<'@@ .'
Index: rpm/Makefile.am
============================================================================
$ cvs diff -u -r2.215 -r2.215.2.1 Makefile.am
--- rpm/Makefile.am 27 Feb 2008 06:56:28 -0000 2.215
+++ rpm/Makefile.am 16 Apr 2008 17:58:24 -0000 2.215.2.1
@@ -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.70.4.1 Makefile.am
--- rpm/build/Makefile.am 11 Nov 2007 15:05:18 -0000 2.70
+++ rpm/build/Makefile.am 16 Apr 2008 17:58:25 -0000 2.70.4.1
@@ -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.177.2.1 Makefile.am
--- rpm/lib/Makefile.am 11 Mar 2008 14:49:52 -0000 2.177
+++ rpm/lib/Makefile.am 16 Apr 2008 17:58:25 -0000 2.177.2.1
@@ -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.9.4.1 Makefile.am
--- rpm/rpmconstant/Makefile.am 27 Dec 2007 10:30:54 -0000 1.9
+++ rpm/rpmconstant/Makefile.am 16 Apr 2008 17:58:25 -0000 1.9.4.1
@@ -1,4 +1,4 @@
-# $Id: Makefile.am,v 1.9 2007/12/27 10:30:54 afb Exp $
+# $Id: Makefile.am,v 1.9.4.1 2008/04/16 17:58:25 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.94.4.1 Makefile.am
--- rpm/rpmdb/Makefile.am 1 Dec 2007 17:49:30 -0000 1.94
+++ rpm/rpmdb/Makefile.am 16 Apr 2008 17:58:26 -0000 1.94.4.1
@@ -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.162.2.1 -r1.162.2.2 Makefile.am
--- rpm/rpmio/Makefile.am 16 Apr 2008 17:54:51 -0000 1.162.2.1
+++ rpm/rpmio/Makefile.am 16 Apr 2008 17:58:26 -0000 1.162.2.2
@@ -21,6 +21,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
