From: Jürg Billeter <j@bitron.ch>
Date: Thu, 15 Dec 2011 13:43:48 +0000 (+0100)
Subject: Do not install vala.m4 with --disable-unversioned
X-Git-Tag: 0.14.2~44
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f20bb5e495cf796cb63f91d1c768ef265e17ed9c;p=thirdparty%2Fvala.git

Do not install vala.m4 with --disable-unversioned

This avoids file conflicts with parallel installations.
---

diff --git a/Makefile.am b/Makefile.am
index 943e23d55..3a8fc6c84 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -33,8 +33,10 @@ DIST_SUBDIRS = \
 	vapigen \
 	$(NULL)
 
+if ENABLE_UNVERSIONED
 aclocaldir = $(datadir)/aclocal
-dist_aclocal_DATA = vala.m4
+aclocal_DATA = vala.m4
+endif
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libvala@PACKAGE_SUFFIX@.pc
@@ -104,6 +106,7 @@ EXTRA_DIST = \
 	ChangeLog.pre-0-5-7 \
 	MAINTAINERS \
 	libvala.pc.in \
+	vala.m4 \
 	.version \
 	build-aux/git-version-gen \
 	build-aux/gitlog-to-changelog \