]> git.ipfire.org Git - thirdparty/vala.git/commitdiff
Do not install vala.m4 with --disable-unversioned
authorJürg Billeter <j@bitron.ch>
Thu, 15 Dec 2011 13:43:48 +0000 (14:43 +0100)
committerJürg Billeter <j@bitron.ch>
Wed, 21 Dec 2011 15:18:58 +0000 (16:18 +0100)
This avoids file conflicts with parallel installations.

Makefile.am

index 943e23d55191c8793d788d927d586072d1371bf0..3a8fc6c842454842574c927b2229ceb48caa3069 100644 (file)
@@ -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 \