RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Mark Hatle
Root: /v/rpm/cvs Email: fray@rpm5.org
Module: file Date: 29-Jun-2007 18:01:00
Branch: HEAD Handle: 2007062917010000
Modified files:
file/src Makefile.am
Log:
When building in a different directory then we configured in, the zlib
components (if local) were not being included properly. Part of the headers
are in the src location, the other part are in the build location.
Summary:
Revision Changes Path
1.27 +1 -1 file/src/Makefile.am
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: file/src/Makefile.am
============================================================================
$ cvs diff -u -r1.26 -r1.27 Makefile.am
--- file/src/Makefile.am 18 Jun 2007 00:03:05 -0000 1.26
+++ file/src/Makefile.am 29 Jun 2007 16:01:00 -0000 1.27
@@ -4,7 +4,7 @@
EXTRA_DIST = test.c
# XXX Make sure compress.c links internal zlib
-INCLUDES = -I../.. -I../../zlib
+INCLUDES = -I$(top_buildddir)/.. -I$(top_builddir)/../zlib -I$(top_srcdir)/../zlib
pkglibdir = @prefix@/lib/rpm/5.0
MAGIC = $(pkglibdir)/magic
@@ .
Received on Fri Jun 29 18:01:00 2007