summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--file/Makefile.am2
-rw-r--r--file/magic/Makefile.am4
-rw-r--r--file/python/.cvsignore6
-rw-r--r--file/src/Makefile.am4
4 files changed, 12 insertions, 4 deletions
diff --git a/file/Makefile.am b/file/Makefile.am
index 59dac9bc1..411966a01 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 82e27193a..50cba0975 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 000000000..c12644364
--- /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 2120601fc..f1ac1af5e 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/%)