]>
Commit | Line | Data |
---|---|---|
6f7a48a4 AM |
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 | |
4 | @@ -1,4 +1,4 @@ | |
5 | -MAGIC = $(pkgdatadir)/magic | |
6 | +MAGIC = /usr/share/file/magic | |
7 | if FSECT5 | |
8 | man_MAGIC = magic.5 | |
9 | else | |
6f7a48a4 AM |
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 | |
13 | @@ -3,4 +3,4 @@ | |
14 | ||
15 | EXTRA_DIST = ChangeLog LEGAL.NOTICE MAINT README | |
a00926bc | 16 | |
a14314e7 | 17 | -SUBDIRS = src magic doc python |
18 | +SUBDIRS = src magic python | |
6f7a48a4 AM |
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 | |
aa0d0676 | 22 | @@ -3,7 +3,7 @@ |
a00926bc | 23 | |
aa0d0676 | 24 | #MAGIC = $(pkgdatadir)/magic |
a00926bc | 25 | pkglibdir = @prefix@/lib/rpm |
aa0d0676 AM |
26 | -MAGIC = $(pkglibdir)/magic |
27 | +MAGIC = /usr/share/file/magic | |
28 | ||
29 | AM_CPPFLAGS = -DMAGIC='"$(MAGIC)"' | |
a00926bc | 30 | |
6f7a48a4 AM |
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 | |
34 | @@ -30,7 +30,7 @@ | |
6f7a48a4 | 35 | pkgbindir = @RPMCONFIGDIR@ |
ed809d1d AM |
36 | pkgbin_PROGRAMS = @WITH_LIBDWARF_DEBUGEDIT@ javadeps \ |
37 | rpmcache rpmdeps rpmfile | |
6f7a48a4 AM |
38 | -MAGIC = $(pkgbindir)/magic |
39 | +MAGIC = /usr/share/file/magic | |
40 | ||
ed809d1d | 41 | bin_PROGRAMS = rpmdigest rpmgraph |
6f7a48a4 | 42 | |
c91fb1e4 AM |
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 | |
46 | @@ -28,7 +28,7 @@ | |
47 | noinst_PROGRAMS = dumpdb | |
48 | ||
49 | pkgbindir = @RPMCONFIGDIR@ | |
ed809d1d AM |
50 | pkgbin_PROGRAMS = @WITH_LIBDWARF_DEBUGEDIT@ javadeps \ |
51 | - rpmcache rpmdeps rpmfile | |
52 | + rpmcache rpmdeps @WITH_RPMFILE@ | |
c91fb1e4 AM |
53 | MAGIC = /usr/share/file/magic |
54 | ||
ed809d1d | 55 | bin_PROGRAMS = rpmdigest rpmgraph |