aboutsummaryrefslogtreecommitdiff
path: root/xkbcomp/Makefile.am
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2009-07-25 18:22:39 +0000
committermarha <marha@users.sourceforge.net>2009-07-25 18:22:39 +0000
commitdc3c299dd0995549e2a6973ca0f25b254afd38a5 (patch)
tree4e041ba8c2c1348b14e7a28c803d860373747a04 /xkbcomp/Makefile.am
parentcd50a4bbac9375d3cd460bbdf88395f802609daf (diff)
downloadvcxsrv-dc3c299dd0995549e2a6973ca0f25b254afd38a5.tar.gz
vcxsrv-dc3c299dd0995549e2a6973ca0f25b254afd38a5.tar.bz2
vcxsrv-dc3c299dd0995549e2a6973ca0f25b254afd38a5.zip
Added xkbcomp-1.1.0.tar.gz
Diffstat (limited to 'xkbcomp/Makefile.am')
-rw-r--r--xkbcomp/Makefile.am4
1 files changed, 2 insertions, 2 deletions
diff --git a/xkbcomp/Makefile.am b/xkbcomp/Makefile.am
index ffcbcbde3..fca1f6700 100644
--- a/xkbcomp/Makefile.am
+++ b/xkbcomp/Makefile.am
@@ -21,7 +21,7 @@
bin_PROGRAMS = xkbcomp
-AM_CFLAGS = $(XKBCOMP_CFLAGS) -DDFLT_XKB_CONFIG_ROOT='"$(datadir)/X11/xkb"'
+AM_CFLAGS = $(XKBCOMP_CFLAGS) -DDFLT_XKB_CONFIG_ROOT='"$(XKBCONFIGROOT)"'
xkbcomp_LDADD = $(XKBCOMP_LIBS)
xkbcomp_SOURCES = \
@@ -105,6 +105,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)
+ $(CHANGELOG_CMD)
dist-hook: ChangeLog