diff options
author | marha <marha@users.sourceforge.net> | 2013-02-05 08:28:03 +0100 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2013-02-05 08:28:03 +0100 |
commit | f6023b333a7fec1691bfb2757ba7615a15196a81 (patch) | |
tree | 17e7b1b021478ef2c470bf8202f144be04c4fea8 /fontconfig/Makefile.am | |
parent | e4326f248054c0276b6e9136cd48e782e42c2644 (diff) | |
parent | 76c527be60066b647468ad66f8e4d7dd18fa1769 (diff) | |
download | vcxsrv-f6023b333a7fec1691bfb2757ba7615a15196a81.tar.gz vcxsrv-f6023b333a7fec1691bfb2757ba7615a15196a81.tar.bz2 vcxsrv-f6023b333a7fec1691bfb2757ba7615a15196a81.zip |
Merge remote-tracking branch 'origin/released'
* origin/released:
fontconfig mesa xkeyboard-config git update 5 feb 2013
Diffstat (limited to 'fontconfig/Makefile.am')
-rw-r--r-- | fontconfig/Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fontconfig/Makefile.am b/fontconfig/Makefile.am index 8510f556f..558b695b9 100644 --- a/fontconfig/Makefile.am +++ b/fontconfig/Makefile.am @@ -80,7 +80,7 @@ EXTRA_DIST += ChangeLog ChangeLog: $(srcdir)/ChangeLog $(srcdir)/ChangeLog: if test -d "$(srcdir)/.git"; then \ - (GIT_DIR=$(top_srcdir)/.git ./missing --run git log --stat) | fmt --split-only > $@.tmp \ + (GIT_DIR=$(top_srcdir)/.git $(GIT) log --stat) | fmt --split-only > $@.tmp \ && mv -f $@.tmp $@ \ || ($(RM) $@.tmp; \ echo Failed to generate ChangeLog, your ChangeLog may be outdated >&2; \ |