Install rpmfile and magic* into /usr/lib/rpm.

CVS patchset: 7501
CVS date: 2004/10/21 19:24:07

file/doc/Makefile.am

@@ -5,7 +5,8 @@ else
 man_MAGIC = magic.4
 endif
 fsect = @fsect@
-man_MANS = file.1 $(man_MAGIC) libmagic.3
+#man_MANS = file.1 $(man_MAGIC) libmagic.3
+noinst_MANS = file.1 $(man_MAGIC) libmagic.3
 
 EXTRA_DIST = file.man magic.man libmagic.man
 CLEANFILES = $(man_MANS)

file/magic/Makefile.am

@@ -1,4 +1,6 @@
-pkgdata_DATA = magic magic.mime magic.mgc magic.mime.mgc
+#pkgdata_DATA = magic magic.mime magic.mgc magic.mime.mgc
+pkglibdir =  @prefix@/lib/rpm
+pkglib_DATA = magic magic.mime magic.mgc magic.mime.mgc
 
 EXTRA_DIST = magic2mime Localstuff Header magic.mime $(magic_FRAGMENTS)
 

file/src/Makefile.am

@@ -20,7 +20,10 @@ libmagic_la_SOURCES = magic.c apprentice.c softmagic.c ascmagic.c \
 	funcs.c apptype.c
 libmagic_la_LDFLAGS = -version-info 1:0:0
 
-#bin_PROGRAMS = file
+pkglib_PROGRAMS = rpmfile
+rpmfile: file
+	-cp $< $@
+
 noinst_PROGRAMS = file
 file_SOURCES = file.c
 file_LDFLAGS = -all-static
@@ -28,7 +31,7 @@ file_LDADD = libmagic.la
 
 listobjs:
 	@echo $(libmagic_la_SOURCES:.c=.lo) > $@
-                                                                                
+
 .PHONY: lint
 lint:
 	$(LINT)  $(DEFS) $(INCLUDES) $(file_SOURCES) $(libmagic_la_SOURCES) $(include_HEADERS) $(noinst_HEADERS)