From 82011226e266f55238fc7e3f7dbe776230b05c3e Mon Sep 17 00:00:00 2001 From: jbj Date: Wed, 5 Jan 2005 13:33:55 +0000 Subject: [PATCH] Install /usr/lib/rpm/magic*. CVS patchset: 7676 CVS date: 2005/01/05 13:33:55 --- file/Makefile.am | 2 +- file/magic/Makefile.am | 4 +++- file/python/.cvsignore | 6 ++++++ file/src/Makefile.am | 4 ++-- 4 files changed, 12 insertions(+), 4 deletions(-) create mode 100644 file/python/.cvsignore diff --git a/file/Makefile.am b/file/Makefile.am index 59dac9b..411966a 100644 --- a/file/Makefile.am +++ b/file/Makefile.am @@ -1,6 +1,6 @@ # don't enforce GNU packaging standards AUTOMAKE_OPTIONS = foreign no-dependencies -EXTRA_DIST = LEGAL.NOTICE MAINT PORTING +EXTRA_DIST = ChangeLog LEGAL.NOTICE MAINT PORTING README SUBDIRS = src magic doc python diff --git a/file/magic/Makefile.am b/file/magic/Makefile.am index 82e2719..50cba09 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/python/.cvsignore b/file/python/.cvsignore new file mode 100644 index 0000000..c126443 --- /dev/null +++ b/file/python/.cvsignore @@ -0,0 +1,6 @@ +*.lo +.deps +.depend +.depend-done +Makefile +Makefile.in diff --git a/file/src/Makefile.am b/file/src/Makefile.am index 2120601..f1ac1af 100644 --- a/file/src/Makefile.am +++ b/file/src/Makefile.am @@ -4,7 +4,7 @@ BUILT_SOURCES = listobjs EXTRA_DIST = test.c pkglibdir = @prefix@/lib/rpm -MAGIC = $(pkglibdir)/magic +#MAGIC = $(pkglibdir)/magic AM_CPPFLAGS = -DMAGIC='"$(MAGIC)"' @@ -32,7 +32,7 @@ listobjs: .PHONY: lint lint: $(LINT) $(DEFS) $(INCLUDES) $(file_SOURCES) $(libmagic_la_SOURCES) $(include_HEADERS) $(noinst_HEADERS) - + .PHONY: sources sources: @echo $(libmagic_la_SOURCES:%=file/src/%) -- 2.7.4