From: Reuben Thomas <rrt@sc3d.org>
Date: Tue, 19 Feb 2008 18:04:09 +0000 (+0000)
Subject: Fixes for fragmented magic.
X-Git-Tag: FILE5_05~456
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0ed5c16ec93a942d57941d78dbef555e299887ca;p=file

Fixes for fragmented magic.
---

diff --git a/magic/Makefile.am b/magic/Makefile.am
index e4cb3853..3efd5c12 100644
--- a/magic/Makefile.am
+++ b/magic/Makefile.am
@@ -1,8 +1,10 @@
-magic_FRAGMENTS = magic/*
+MAGIC_FRAGMENT_DIR = $(top_srcdir)/magic/magic
 
-pkgdata_DATA = magic.mgc $(magic_FRAGMENTS)
+MAGIC_FRAGMENTS = $(MAGIC_FRAGMENT_DIR)/*
 
-EXTRA_DIST = Localstuff $(magic_FRAGMENTS)
+pkgdata_DATA = magic.mgc $(MAGIC_FRAGMENTS)
+
+EXTRA_DIST = Localstuff $(MAGIC_FRAGMENTS)
 
 CLEANFILES = magic.mgc
 
@@ -15,4 +17,4 @@ FILE_COMPILE = $(top_builddir)/src/file
 endif
 
 magic.mgc: $(magic_FRAGMENTS) $(FILE_COMPILE)
-	$(FILE_COMPILE) -C -m $(top_srcdir)/magic/magic
+	$(FILE_COMPILE) -C -m $(MAGIC_FRAGMENT_DIR)