summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorjbj <devnull@localhost>2004-10-21 21:18:35 +0000
committerjbj <devnull@localhost>2004-10-21 21:18:35 +0000
commit883580417100b31808d0ef8d69bcfdd510e85d0a (patch)
tree7022893e6fa1199669b6d8aacda0e5d537f7ad85 /tools
parentbc1ad5caaf0c827355f4254cb3b4e7f4e76a94b4 (diff)
downloadrpm-883580417100b31808d0ef8d69bcfdd510e85d0a.tar.gz
rpm-883580417100b31808d0ef8d69bcfdd510e85d0a.tar.bz2
rpm-883580417100b31808d0ef8d69bcfdd510e85d0a.zip
Compile in the correct path to /usr/lib/rpm/magic.
Add magic for rpm packages and headers. Add MAGIC_COMPRESS and MAGIC_CHECK to extract types from compressed files. Permit info and man pages into RPMTAG_FILECLASS. Package all the Berkeley DB utilities with rpm. CVS patchset: 7502 CVS date: 2004/10/21 21:18:35
Diffstat (limited to 'tools')
-rw-r--r--tools/Makefile.am4
1 files changed, 3 insertions, 1 deletions
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 2f19956cc..f0ab8adfe 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -31,6 +31,7 @@ noinst_PROGRAMS = dumpdb
pkgbindir = @RPMCONFIGDIR@
pkgbin_PROGRAMS = debugedit javadeps rpmcache rpmdeps rpmfile
+MAGIC = $(pkgbindir)/magic
bin_PROGRAMS = rpmgraph
@@ -49,11 +50,12 @@ rpmdeps_SOURCES = rpmdeps.c
rpmdeps_LDADD = $(top_builddir)/build/librpmbuild.la
#rpmdeps_LDFLAGS = $(staticLDFLAGS)
-rpmfile.c: $(top_builddir)/file/src/file.c
+rpmfile.c: $(top_srcdir)/file/src/file.c
rm -f $@
ln -s $< $@
rpmfile_SOURCES = rpmfile.c
+rpmfile_CFLAGS = -DMAGIC='"$(MAGIC)"'
rpmfile_LDADD = $(top_builddir)/rpmio/librpmio.la
#rpmfile_LDFLAGS = $(staticLDFLAGS)