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:   23-Jul-2007 23:19:21
  Branch: HEAD                             Handle: 2007072322192100

  Modified files:
    file/src                Makefile.am

  Log:
    align file/src/Makefile.am with the remaining ones like
    zlib/Makefile.am

  Summary:
    Revision    Changes     Path
    1.29        +6  -10     file/src/Makefile.am
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: file/src/Makefile.am
  ============================================================================
  $ cvs diff -u -r1.28 -r1.29 Makefile.am
  --- file/src/Makefile.am	3 Jul 2007 16:32:12 -0000	1.28
  +++ file/src/Makefile.am	23 Jul 2007 21:19:21 -0000	1.29
  @@ -3,28 +3,24 @@
   
   EXTRA_DIST = test.c
   
  -pkglibdir =  @prefix@/lib/rpm/5.0
  -MAGIC    = $(pkglibdir)/magic
  +pkglibdir = @USRLIBRPM@
  +MAGIC = $(pkglibdir)/magic
   
  -# 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
  -
  -#lib_LTLIBRARIES = libmagic.la
  -#usrlibdir = $(libdir)@MARK64@
  -#usrlib_LTLIBRARIES = libmagic.la
   noinst_LTLIBRARIES = libmagic.la
   
   libmagic_la_SOURCES = magic.c apprentice.c softmagic.c ascmagic.c \
   	compress.c is_tar.c readelf.c print.c fsmagic.c funcs.c apptype.c
  -libmagic_la_LDFLAGS = -no-undefined -version-info 1:0:0
  +libmagic_la_LDFLAGS =
  +libmagic.la: $(libmagic_la_OBJECTS) $(libmagic_la_DEPENDENCIES) 
  +	$(libmagic_la_LINK) $(libmagic_la_OBJECTS) $(libmagic_la_LIBADD)
   
   noinst_PROGRAMS = file
   file_SOURCES = file.c
  -file_LDFLAGS = -L$(top_builddir)/../zlib # -all-static
  +file_LDFLAGS = -L$(top_builddir)/../zlib
   file_LDADD = libmagic.la
   
   listobjs:
  @@ .