[Nickle] nickle: Branch 'master'

[Keith Packard]

 Makefile.am |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f19cc51156c96689ac0207d3c30ed549c24afd6b
Author: Keith Packard <keithp at keithp.com>
Date:   Wed Feb 29 16:54:16 2012 +1300

    git-log has become git log
    
    Needed to build ChangeLog
    
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/Makefile.am b/Makefile.am
index 1c543cf..54718a8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -26,7 +26,7 @@ MAINTAINERCLEANFILES=ChangeLog
 .PHONY: ChangeLog
 
 ChangeLog:
-	(GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || \
+	(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