1 diff -ur rpm.org/file/doc/Makefile.am rpm/file/doc/Makefile.am
2 --- rpm.org/file/doc/Makefile.am 2004-11-18 15:04:33.000000000 +0100
3 +++ rpm/file/doc/Makefile.am 2004-11-22 01:02:30.114807597 +0100
5 -MAGIC = $(pkgdatadir)/magic
6 +MAGIC = /usr/share/file/magic
10 diff -ur rpm.org/file/Makefile.am rpm/file/Makefile.am
11 --- rpm.org/file/Makefile.am 2004-11-18 15:04:32.000000000 +0100
12 +++ rpm/file/Makefile.am 2004-11-22 01:01:36.817958788 +0100
15 EXTRA_DIST = ChangeLog LEGAL.NOTICE MAINT README
17 -SUBDIRS = src magic doc python
18 +SUBDIRS = src magic python
19 diff -ur rpm.org/file/src/Makefile.am rpm/file/src/Makefile.am
20 --- rpm.org/file/src/Makefile.am 2004-11-18 15:04:33.000000000 +0100
21 +++ rpm/file/src/Makefile.am 2004-11-22 01:01:36.823963503 +0100
24 #MAGIC = $(pkgdatadir)/magic
25 pkglibdir = @prefix@/lib/rpm
26 -MAGIC = $(pkglibdir)/magic
27 +MAGIC = /usr/share/file/magic
29 AM_CPPFLAGS = -DMAGIC='"$(MAGIC)"'
31 diff -ur rpm.org/tools/Makefile.am rpm/tools/Makefile.am
32 --- rpm.org/tools/Makefile.am 2004-11-22 00:56:22.484205000 +0100
33 +++ rpm/tools/Makefile.am 2004-11-22 01:03:05.178339563 +0100
35 pkgbindir = @RPMCONFIGDIR@
36 pkgbin_PROGRAMS = @WITH_LIBDWARF_DEBUGEDIT@ javadeps \
37 rpmcache rpmdeps rpmfile
38 -MAGIC = $(pkgbindir)/magic
39 +MAGIC = /usr/share/file/magic
41 bin_PROGRAMS = rpmdigest rpmgraph
43 diff -urbB rpm-4.4.2.org/tools/Makefile.am rpm-4.4.2/tools/Makefile.am
44 --- rpm-4.4.2.org/tools/Makefile.am 2005-09-03 16:35:22.169432000 +0200
45 +++ rpm-4.4.2/tools/Makefile.am 2005-09-03 16:36:53.947479736 +0200
47 noinst_PROGRAMS = dumpdb
49 pkgbindir = @RPMCONFIGDIR@
50 pkgbin_PROGRAMS = @WITH_LIBDWARF_DEBUGEDIT@ javadeps \
51 - rpmcache rpmdeps rpmfile
52 + rpmcache rpmdeps @WITH_RPMFILE@
53 MAGIC = /usr/share/file/magic
55 bin_PROGRAMS = rpmdigest rpmgraph