diff options
| author | marha <marha@users.sourceforge.net> | 2009-07-25 18:18:08 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-07-25 18:18:08 +0000 |
| commit | e445df175688f07d599649591c990d432375c67e (patch) | |
| tree | fc2295b9683852cab5394a4f187ca0001c987e4a /X11/Makefile.am | |
| parent | cbeb9ffa0c58e5e9b012ea3eb17dbf192659627f (diff) | |
| parent | cd50a4bbac9375d3cd460bbdf88395f802609daf (diff) | |
| download | vcxsrv-e445df175688f07d599649591c990d432375c67e.tar.gz vcxsrv-e445df175688f07d599649591c990d432375c67e.tar.bz2 vcxsrv-e445df175688f07d599649591c990d432375c67e.zip | |
svn merge file:///D:/svnrepos/vcxsrv/branches/released .
Diffstat (limited to 'X11/Makefile.am')
| -rw-r--r-- | X11/Makefile.am | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/X11/Makefile.am b/X11/Makefile.am index 533d281fb..96c6b2604 100644 --- a/X11/Makefile.am +++ b/X11/Makefile.am @@ -32,14 +32,14 @@ nodist_xproto_HEADERS = \ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = xproto.pc -EXTRA_DIST = autogen.sh xproto.pc.in ChangeLog +EXTRA_DIST = xproto.pc.in ChangeLog CLEANFILES=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 |