=== modified file 'Makefile.am'
--- old/Makefile.am	2011-12-15 13:43:48 +0000
+++ new/Makefile.am	2012-04-18 02:18:46 +0000
@@ -33,9 +33,15 @@ DIST_SUBDIRS = \
 	vapigen \
 	$(NULL)
 
-if ENABLE_UNVERSIONED
+aclocal_files = vala.m4
 aclocaldir = $(datadir)/aclocal
-aclocal_DATA = vala.m4
+if ENABLE_UNVERSIONED
+aclocal_DATA = $(aclocal_files)
+else
+aclocal_DATA = $(aclocal_files:.m4=@PACKAGE_SUFFIX@.m4)
+
+%@PACKAGE_SUFFIX@.m4: %.m4
+	cp $< $@
 endif
 
 pkgconfigdir = $(libdir)/pkgconfig
@@ -98,7 +104,7 @@ gen-ChangeLog:
 	fi
 
 CLEANFILES = \
-	libvala@PACKAGE_SUFFIX@.pc
+	libvala@PACKAGE_SUFFIX@.pc \
 	$(NULL)
 
 EXTRA_DIST = \
@@ -106,10 +112,10 @@ EXTRA_DIST = \
 	ChangeLog.pre-0-5-7 \
 	MAINTAINERS \
 	libvala.pc.in \
-	vala.m4 \
 	.version \
 	build-aux/git-version-gen \
 	build-aux/gitlog-to-changelog \
+	$(aclocal_files) \
 	$(NULL)
 
 DISTCLEANFILES = version.h

