]>
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 | |
10 | Tylko w rpm/file/doc: Makefile.am~ | |
11 | diff -ur rpm.org/file/Makefile.am rpm/file/Makefile.am | |
12 | --- rpm.org/file/Makefile.am 2004-11-18 15:04:32.000000000 +0100 | |
13 | +++ rpm/file/Makefile.am 2004-11-22 01:01:36.817958788 +0100 | |
14 | @@ -3,4 +3,4 @@ | |
15 | ||
16 | EXTRA_DIST = ChangeLog LEGAL.NOTICE MAINT README | |
a00926bc JB |
17 | |
18 | -SUBDIRS = src magic doc | |
49deaedf | 19 | +SUBDIRS = src magic |
6f7a48a4 AM |
20 | Tylko w rpm/file: Makefile.am.orig |
21 | diff -ur rpm.org/file/src/Makefile.am rpm/file/src/Makefile.am | |
22 | --- rpm.org/file/src/Makefile.am 2004-11-18 15:04:33.000000000 +0100 | |
23 | +++ rpm/file/src/Makefile.am 2004-11-22 01:01:36.823963503 +0100 | |
aa0d0676 | 24 | @@ -3,7 +3,7 @@ |
a00926bc | 25 | |
aa0d0676 | 26 | #MAGIC = $(pkgdatadir)/magic |
a00926bc | 27 | pkglibdir = @prefix@/lib/rpm |
aa0d0676 AM |
28 | -MAGIC = $(pkglibdir)/magic |
29 | +MAGIC = /usr/share/file/magic | |
30 | ||
31 | AM_CPPFLAGS = -DMAGIC='"$(MAGIC)"' | |
a00926bc | 32 | |
6f7a48a4 AM |
33 | diff -ur rpm.org/tools/Makefile.am rpm/tools/Makefile.am |
34 | --- rpm.org/tools/Makefile.am 2004-11-22 00:56:22.484205000 +0100 | |
35 | +++ rpm/tools/Makefile.am 2004-11-22 01:03:05.178339563 +0100 | |
36 | @@ -30,7 +30,7 @@ | |
37 | ||
38 | pkgbindir = @RPMCONFIGDIR@ | |
39 | pkgbin_PROGRAMS = debugedit javadeps rpmcache rpmdeps rpmfile | |
40 | -MAGIC = $(pkgbindir)/magic | |
41 | +MAGIC = /usr/share/file/magic | |
42 | ||
43 | bin_PROGRAMS = rpmgraph | |
44 |