diff options
| author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2010-04-16 00:57:24 -0700 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2010-04-21 21:20:05 -0700 |
| commit | 17f97355310d75b05bb3f7a1007ca752fe100029 (patch) | |
| tree | 9c30c4ec5e334926bf09bc6d58319eb934600cf3 | |
| parent | fb043c2097e12b0d0c6056727fd0274229601cc2 (diff) | |
Move to xorg-macros 1.4 & use INSTALL_CMD to generate INSTALL file
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
| -rw-r--r-- | Makefile.am | 12 | ||||
| -rw-r--r-- | configure.ac | 12 |
2 files changed, 13 insertions, 11 deletions
diff --git a/Makefile.am b/Makefile.am index babca5f..6148221 100644 --- a/Makefile.am +++ b/Makefile.am @@ -48,12 +48,14 @@ SUFFIXES = .$(APP_MAN_SUFFIX) .man EXTRA_DIST = $(appman_PRE) -EXTRA_DIST += ChangeLog -MAINTAINERCLEANFILES = ChangeLog +MAINTAINERCLEANFILES = ChangeLog INSTALL -.PHONY: ChangeLog +.PHONY: ChangeLog INSTALL + +INSTALL: + $(INSTALL_CMD) ChangeLog: - (GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2) + $(CHANGELOG_CMD) -dist-hook: ChangeLog +dist-hook: ChangeLog INSTALL diff --git a/configure.ac b/configure.ac index db3eeb2..1cfb14b 100644 --- a/configure.ac +++ b/configure.ac @@ -26,17 +26,17 @@ AC_INIT(lndir, [1.0.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE +# Require xorg-macros 1.4 or later: XORG_DEFAULT_OPTIONS, INSTALL_CMD +m4_ifndef([XORG_MACROS_VERSION], + [m4_fatal([must install xorg-macros 1.4 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.4) +XORG_DEFAULT_OPTIONS + AM_CONFIG_HEADER(config.h) AC_PROG_INSTALL AC_PROG_CC -# Require xorg-macros 1.3 or later: XORG_DEFAULT_OPTIONS -m4_ifndef([XORG_MACROS_VERSION], - [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])]) -XORG_MACROS_VERSION(1.3) -XORG_DEFAULT_OPTIONS - # Checks for pkg-config packages PKG_CHECK_MODULES(XPROTO, xproto) AC_SUBST(XPROTO_CFLAGS) |