- always translate %%{ix86} to %%{_target_cpu}

[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
@@ -24,7 +24,7 @@
 file_LDADD =	libfmagic.la
 
 pkglibdir =  @prefix@/lib/rpm
-MAGIC	 = $(pkglibdir)/magic
+MAGIC	 = /usr/share/file/magic
 CPPFLAGS = -DMAGIC='"$(MAGIC)"'
 
 listobjs: