diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2008-11-14 13:37:05 +0100 |
---|---|---|
committer | Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> | 2008-11-28 04:06:06 -0200 |
commit | 077871dce17f78ffa94e8bc2de21461fd8a4960d (patch) | |
tree | 13176b54295ae17e28f25935f99c9eea8d232164 /Makefile.am | |
parent | 58d940fbb303cc16549f913e33429362760132de (diff) |
build fixes
use AM_CFLAGS instead of xkbprint_CFLAGS to avoid need for AM_PROG_CC_C_O
replace 'git-log' by 'git log' as required by git-1.6.x
Diffstat (limited to 'Makefile.am')
-rw-r--r-- | Makefile.am | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index 7b8c6a9..2e48a7b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -21,7 +21,7 @@ bin_PROGRAMS = xkbprint -xkbprint_CFLAGS = $(XKBPRINT_CFLAGS) +AM_CFLAGS = $(XKBPRINT_CFLAGS) xkbprint_LDADD = $(XKBPRINT_LIBS) xkbprint_SOURCES = \ @@ -72,6 +72,6 @@ MAINTAINERCLEANFILES = ChangeLog .PHONY: ChangeLog 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) + (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) dist-hook: ChangeLog |