summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--Makefile.am3
-rw-r--r--src/Makefile.am2
3 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 0a3d34d..0b9fe92 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-10-04 Kevin E. Martin <kem-at-freedesktop-dot-org>
+
+ * Makefile.am:
+ * src/Makefile.am:
+ magic lives in src, so add it to EXTRA_DIST there instead
+
2005-07-08 Keith Packard <keithp@keithp.com>
* .cvsignore:
diff --git a/Makefile.am b/Makefile.am
index 4a2c2a1..5df3025 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,5 +24,4 @@ SUBDIRS = src
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = xkbfile.pc
-EXTRA_DIST = xkbfile.pc.in autogen.sh magic
-
+EXTRA_DIST = xkbfile.pc.in autogen.sh
diff --git a/src/Makefile.am b/src/Makefile.am
index 6719d6a..ef9a4fb 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -32,3 +32,5 @@ libxkbfileinclude_HEADERS = \
$(top_srcdir)/include/X11/extensions/XKBconfig.h\
$(top_srcdir)/include/X11/extensions/XKMformat.h\
$(top_srcdir)/include/X11/extensions/XKBfile.h
+
+EXTRA_DIST = magic