[packages/rpm.git] / rpm-magic-usesystem.patch

diff -urN rpm-4.3.org/file/Makefile.am rpm-4.3/file/Makefile.am
--- rpm-4.3.org/file/Makefile.am	2004-01-07 02:01:53.050779393 +0100
+++ rpm-4.3/file/Makefile.am	2004-01-07 02:10:07.851944923 +0100
@@ -1,3 +1,3 @@
 EXTRA_DIST = LEGAL.NOTICE MAINT Makefile.std
 
-SUBDIRS = src magic doc
+SUBDIRS = src magic
diff -urN rpm-4.3.org/file/src/Makefile.am rpm-4.3/file/src/Makefile.am
--- rpm-4.3.org/file/src/Makefile.am	2004-01-07 02:01:54.159548970 +0100
+++ rpm-4.3/file/src/Makefile.am	2004-01-07 02:09:30.670672672 +0100
@@ -3,7 +3,7 @@
 
 #MAGIC	 = $(pkgdatadir)/magic
 pkglibdir =  @prefix@/lib/rpm
-MAGIC    = $(pkglibdir)/magic
+MAGIC    = /usr/share/file/magic
 
 AM_CPPFLAGS = -DMAGIC='"$(MAGIC)"'
Commit	Line	Data
49deaedf AM	1	diff -urN rpm-4.3.org/file/Makefile.am rpm-4.3/file/Makefile.am
	2	--- rpm-4.3.org/file/Makefile.am 2004-01-07 02:01:53.050779393 +0100
	3	+++ rpm-4.3/file/Makefile.am 2004-01-07 02:10:07.851944923 +0100
	4	@@ -1,3 +1,3 @@
a00926bc JB	5	EXTRA_DIST = LEGAL.NOTICE MAINT Makefile.std
	6
	7	-SUBDIRS = src magic doc
49deaedf AM	8	+SUBDIRS = src magic
	9	diff -urN rpm-4.3.org/file/src/Makefile.am rpm-4.3/file/src/Makefile.am
	10	--- rpm-4.3.org/file/src/Makefile.am 2004-01-07 02:01:54.159548970 +0100
	11	+++ rpm-4.3/file/src/Makefile.am 2004-01-07 02:09:30.670672672 +0100
aa0d0676	12	@@ -3,7 +3,7 @@
a00926bc	13
aa0d0676	14	#MAGIC = $(pkgdatadir)/magic
a00926bc	15	pkglibdir = @prefix@/lib/rpm
aa0d0676 AM	16	-MAGIC = $(pkglibdir)/magic
	17	+MAGIC = /usr/share/file/magic
	18
	19	AM_CPPFLAGS = -DMAGIC='"$(MAGIC)"'
a00926bc	20
49deaedf	21