diff options
| author | Jürg Billeter <j@bitron.ch> | 2011-12-15 14:43:48 +0100 |
|---|---|---|
| committer | Jürg Billeter <j@bitron.ch> | 2011-12-15 14:43:48 +0100 |
| commit | 74074741bf67cebd71c396701c7fbce45db9739d (patch) | |
| tree | 0009a3aebdd3581b47043bb3352f07e8ad047a30 /Makefile.am | |
| parent | 7b34e0ca7dc5d6cef5b75e8d8f7dc2723050df0d (diff) | |
| download | vala-74074741bf67cebd71c396701c7fbce45db9739d.tar.gz | |
Do not install vala.m4 with --disable-unversioned
This avoids file conflicts with parallel installations.
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 5 |
1 files changed, 4 insertions, 1 deletions
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 \ |