summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--file/doc/Makefile.am3
-rw-r--r--file/magic/Makefile.am4
-rw-r--r--file/src/Makefile.am7
3 files changed, 10 insertions, 4 deletions
diff --git a/file/doc/Makefile.am b/file/doc/Makefile.am
index 4a78589ce..d3e28e747 100644
--- a/file/doc/Makefile.am
+++ b/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)
diff --git a/file/magic/Makefile.am b/file/magic/Makefile.am
index 0c716df5c..eb8116c2b 100644
--- a/file/magic/Makefile.am
+++ b/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)
diff --git a/file/src/Makefile.am b/file/src/Makefile.am
index 9fa447c83..0f875b55e 100644
--- a/file/src/Makefile.am
+++ b/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)