diff options
| author | marha <marha@users.sourceforge.net> | 2009-10-07 09:21:18 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-10-07 09:21:18 +0000 |
| commit | b741086f4b268041e1c171c6dc4bb9182e7666d3 (patch) | |
| tree | 02dfe9fd170cddb55b6532de49768133221ef3b6 /libxkbfile/Makefile.am | |
| parent | f78ab58911de1fa9a15afffcd4fcdc11ae67c646 (diff) | |
| parent | c73dc01b6de45612b24dc2dd34fba24d81ebf46c (diff) | |
| download | vcxsrv-b741086f4b268041e1c171c6dc4bb9182e7666d3.tar.gz vcxsrv-b741086f4b268041e1c171c6dc4bb9182e7666d3.tar.bz2 vcxsrv-b741086f4b268041e1c171c6dc4bb9182e7666d3.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'libxkbfile/Makefile.am')
| -rw-r--r-- | libxkbfile/Makefile.am | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/libxkbfile/Makefile.am b/libxkbfile/Makefile.am index 14028f2ed..0f095e812 100644 --- a/libxkbfile/Makefile.am +++ b/libxkbfile/Makefile.am @@ -24,14 +24,12 @@ SUBDIRS = src pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = xkbfile.pc -EXTRA_DIST = xkbfile.pc.in autogen.sh - -EXTRA_DIST += ChangeLog +EXTRA_DIST = xkbfile.pc.in ChangeLog 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 |