RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  ____________________________________________________________________________

  Server: rpm5.org                         Name:   Ralf S. Engelschall
  Root:   /v/rpm/cvs                       Email:  rse@rpm5.org
  Module: file                             Date:   03-Jul-2007 18:32:12
  Branch: HEAD                             Handle: 2007070317321200

  Modified files:
    file/src                Makefile.am

  Log:
    INCLUDES today is named AM_CPPFLAGS; fix typo:
    s/top_buildddir/top_builddir/; use top_builddir also in file_LDFLAGS

  Summary:
    Revision    Changes     Path
    1.28        +4  -5      file/src/Makefile.am
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: file/src/Makefile.am
  ============================================================================
  $ cvs diff -u -r1.27 -r1.28 Makefile.am
  --- file/src/Makefile.am	29 Jun 2007 16:01:00 -0000	1.27
  +++ file/src/Makefile.am	3 Jul 2007 16:32:12 -0000	1.28
  @@ -3,13 +3,12 @@
   
   EXTRA_DIST = test.c
   
  -# XXX Make sure compress.c links internal zlib
  -INCLUDES = -I$(top_buildddir)/.. -I$(top_builddir)/../zlib -I$(top_srcdir)/../zlib
  -
   pkglibdir =  @prefix@/lib/rpm/5.0
   MAGIC    = $(pkglibdir)/magic
   
  -AM_CPPFLAGS = -DMAGIC='"$(MAGIC)"' -DHAVE_LIBZ=1
  +# XXX Make sure compress.c links internal zlib
  +AM_CPPFLAGS = -I$(top_builddir)/.. -I$(top_builddir)/../zlib -I$(top_srcdir)/../zlib
  +AM_CPPFLAGS += -DMAGIC='"$(MAGIC)"' -DHAVE_LIBZ=1
   
   include_HEADERS = # magic.h
   noinst_HEADERS = file.h magic.h names.h patchlevel.h readelf.h tar.h
  @@ -25,7 +24,7 @@
   
   noinst_PROGRAMS = file
   file_SOURCES = file.c
  -file_LDFLAGS = -L../../zlib # -all-static
  +file_LDFLAGS = -L$(top_builddir)/../zlib # -all-static
   file_LDADD = libmagic.la
   
   listobjs:
  @@ .