diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2009-01-26 21:59:54 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2009-01-26 21:59:54 +0000 |
| commit | b25be02568441396a42925317303c2710bebd86e (patch) | |
| tree | 5ea1c4a58abe9dfe636db1b4c2fb3587202f3c51 /util/macros/Makefile.am | |
| parent | 86c7f44588cf49aa6e21d533a00c676a90589d1b (diff) | |
util/macros 1.2.1. Tested on a ports bulk build by naddy@.
Diffstat (limited to 'util/macros/Makefile.am')
| -rw-r--r-- | util/macros/Makefile.am | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/util/macros/Makefile.am b/util/macros/Makefile.am index 792d62fd5..265bfd79c 100644 --- a/util/macros/Makefile.am +++ b/util/macros/Makefile.am @@ -20,15 +20,17 @@ # CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. aclocaldir = $(datadir)/aclocal -aclocal_DATA = xorgversion.m4 xorg-macros.m4 +aclocal_DATA = xorg-macros.m4 -EXTRA_DIST = $(aclocal_DATA) ChangeLog +# Previous versions used to install xorgversion.m4, now integrated +# into xorg-macros.m4. Explicitly remove that old file in order not +# to have a macro defined in two different files. +install-data-hook: + rm -f $(DESTDIR)$(aclocaldir)/xorgversion.m4 .PHONY: ChangeLog ChangeLog: - (cd $(srcdir) && git-log) > ChangeLog + $(CHANGELOG_CMD) dist-hook: ChangeLog - -DISTCLEANFILES = ChangeLog |