From c7510bceec93c47a9176f73eea0db7900ebb8208 Mon Sep 17 00:00:00 2001
From: jbj <devnull@localhost>
Date: Wed, 5 Jan 2005 04:46:01 +0000
Subject: build rpm-4.4.1-0.6.

CVS patchset: 7674
CVS date: 2005/01/05 04:46:01
---
 Makefile.am        | 14 +++++++-------
 misc/Makefile.am   |  2 +-
 python/Makefile.am |  1 +
 rpm.spec.in        |  6 +++++-
 rpmdb/Makefile.am  |  1 +
 5 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index ade614964..de17d3d6f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -60,19 +60,19 @@ rpm_SOURCES =
 rpm_LDFLAGS =		$(myLDFLAGS)
 rpm_LDADD =		rpm.o $(top_builddir)/build/.libs/librpmbuild.a $(myLDADD)
 rpm.o:	$(top_srcdir)/rpmqv.c
-	$(COMPILE) -DIAM_RPMDB -DIAM_RPMEIU -DIAM_RPMK -DIAM_RPMQV -o $@ -c rpmqv.c
+	$(COMPILE) -DIAM_RPMDB -DIAM_RPMEIU -DIAM_RPMK -DIAM_RPMQV -o $@ -c $(top_srcdir)/rpmqv.c
 
-rpmb_SOURCES =		build.c
+rpmb_SOURCES =		$(top_srcdir)/build.c
 rpmb_LDFLAGS =		$(myLDFLAGS)
 rpmb_LDADD =		rpmb.o $(top_builddir)/build/librpmbuild.la $(myLDADD)
 rpmb.o:	$(top_srcdir)/rpmqv.c
-	$(COMPILE) -DIAM_RPMBT -o $@ -c rpmqv.c
+	$(COMPILE) -DIAM_RPMBT -o $@ -c $(top_srcdir)/rpmqv.c
 
 rpmd_SOURCES =
 rpmd_LDFLAGS =		$(myLDFLAGS)
 rpmd_LDADD =		rpmd.o $(myLDADD)
 rpmd.o:	$(top_srcdir)/rpmqv.c
-	$(COMPILE) -DIAM_RPMDB -o $@ -c rpmqv.c
+	$(COMPILE) -DIAM_RPMDB -o $@ -c $(top_srcdir)/rpmqv.c
 
 rpmi_SOURCES =
 #rpmi_LDFLAGS =		$(myLDFLAGS) $(staticLDFLAGS)
@@ -80,19 +80,19 @@ rpmi_SOURCES =
 rpmi_LDFLAGS =		$(myLDFLAGS)
 rpmi_LDADD =		rpmi.o $(myLDADD)
 rpmi.o:	$(top_srcdir)/rpmqv.c
-	$(COMPILE) -DIAM_RPMEIU -o $@ -c rpmqv.c
+	$(COMPILE) -DIAM_RPMEIU -o $@ -c $(top_srcdir)/rpmqv.c
 
 rpmk_SOURCES =
 rpmk_LDFLAGS =		$(myLDFLAGS)
 rpmk_LDADD =		rpmk.o $(myLDADD)
 rpmk.o:	$(top_srcdir)/rpmqv.c
-	$(COMPILE) -DIAM_RPMK -o $@ -c rpmqv.c
+	$(COMPILE) -DIAM_RPMK -o $@ -c $(top_srcdir)/rpmqv.c
 
 rpmq_SOURCES =
 rpmq_LDFLAGS =		$(myLDFLAGS)
 rpmq_LDADD =		rpmq.o $(top_builddir)/build/librpmbuild.la $(myLDADD)
 rpmq.o:	$(top_srcdir)/rpmqv.c
-	$(COMPILE) -DIAM_RPMQV -o $@ -c rpmqv.c
+	$(COMPILE) -DIAM_RPMQV -o $@ -c $(top_srcdir)/rpmqv.c
 
 rpm2cpio_SOURCES =	$(top_srcdir)/rpm2cpio.c
 rpm2cpio_LDFLAGS =	$(myLDFLAGS)
diff --git a/misc/Makefile.am b/misc/Makefile.am
index f3569c7b1..86d7fe7de 100644
--- a/misc/Makefile.am
+++ b/misc/Makefile.am
@@ -2,7 +2,7 @@
 
 AUTOMAKE_OPTIONS = 1.4 foreign
 
-INCLUDES = -I. @INCPATH@
+INCLUDES = -I.  -I$(top_srcdir) @INCPATH@
 
 EXTRA_DIST = \
 	alloca.c	basename.c	err.c		error.c		\
diff --git a/python/Makefile.am b/python/Makefile.am
index 3cb04ea25..2f3841a64 100644
--- a/python/Makefile.am
+++ b/python/Makefile.am
@@ -12,6 +12,7 @@ SUBDIRS = rpmdb rpm
 EXTRA_DIST = system.h rpmdebug-py.c
 
 INCLUDES = -I. \
+	-I$(top_srcdir) \
 	-I$(top_srcdir)/lib \
 	-I$(top_srcdir)/rpmdb \
 	-I$(top_srcdir)/rpmio \
diff --git a/rpm.spec.in b/rpm.spec.in
index 7dcb95092..0a8fa781b 100644
--- a/rpm.spec.in
+++ b/rpm.spec.in
@@ -496,7 +496,11 @@ exit 0
 %{__includedir}/popt.h
 
 %changelog
-* Sun Jan  2 2005 Jeff Johnson <jbj@jbj.org> 4.4.1-0.4
+* Tue Jan  4 2005 Jeff Johnson <jbj@jbj.org> 4.4.1-0.6
+- mac os x patches (#131943,#131944,#132924,#132926).
+- mac os x patches (#133611, #133612, #134637).
+
+* Sun Jan  2 2005 Jeff Johnson <jbj@jbj.org> 4.4.1-0.5
 - upgrade to db-4.3.27.
 - revert MAGIC_COMPRESS, real fix is in libmagic (#143782).
 - upgrade to file-4.12 internal.
diff --git a/rpmdb/Makefile.am b/rpmdb/Makefile.am
index e5391f4f6..10f7d0a84 100644
--- a/rpmdb/Makefile.am
+++ b/rpmdb/Makefile.am
@@ -5,6 +5,7 @@ AUTOMAKE_OPTIONS = 1.4 foreign
 LINT = splint
 
 INCLUDES = -I. \
+	-I$(top_srcdir) \
 	-I$(top_srcdir)/build \
 	-I$(top_srcdir)/lib \
 	-I$(top_srcdir)/rpmio \
-- 
cgit v1.2.3