diff options
| author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2008-11-14 22:26:06 +0100 |
|---|---|---|
| committer | Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> | 2008-11-29 05:13:32 -0200 |
| commit | b8a5186c585b4f01971457f0d59cc7480cf528e8 (patch) | |
| tree | 8cab6c2b3a6acb78a0a2ed26f76343d255f01c1d /Makefile.am | |
| parent | a3a533044de7c8c360d0de312ac75b32db04e35e (diff) | |
reorganize autoconf macro files
append xorgversion.m4 to xorg-macros.m4.in, instead of installing
it as separate file.
Avoid copying some code from xorgversion.m4 to configure.ac.
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index fd5c1ea..3e7ff73 100644 --- a/Makefile.am +++ b/Makefile.am @@ -20,9 +20,15 @@ # 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 + +EXTRA_DIST = ChangeLog .PHONY: ChangeLog |