summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--Makefile.am4
-rw-r--r--configure.ac4
3 files changed, 10 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 4284656..82293bf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-06-22 Theo van Klaveren <t.vanklaveren@student.utwente.nl>
+
+ Fix make distcheck.
+
+ * Makefile.am: Add xtrans.m4 to EXTRA_DIST. Revert installation
+ of xtrans.m4 outside of prefix.
+ * configure.ac: Remove check for aclocal include dir.
+
2005-06-09 Alexander Gottwald <ago@freedesktop.org>
* Makefile.am:
diff --git a/Makefile.am b/Makefile.am
index 41e8927..8bbe84c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,10 +11,10 @@ Xtransinclude_HEADERS = \
Xtransutil.c \
transport.c
-aclocaldir = @ACLOCALDIR@
+aclocaldir = $(datadir)/aclocal
aclocal_DATA = xtrans.m4
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = xtrans.pc
-EXTRA_DIST = xtrans.pc.in
+EXTRA_DIST = xtrans.pc.in ${aclocal_DATA}
diff --git a/configure.ac b/configure.ac
index 37d351f..d48834b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -37,10 +37,6 @@ AC_CHECK_FUNC(fchown, [fchown_define="-DHAS_FCHOWN"], [fchown_define=""])
AC_SUBST(fchown_define)
-ACLOCALDIR=`aclocal --print-ac-dir`
-
-AC_SUBST(ACLOCALDIR)
-
# sticky bit
#
# if any system exists without sticky dir bits this