Merge branch 'master' into ubuntu

Conflicts: Makefile.am
EvolBioInf · Nov 3, 2014 · d1d4c81 · d1d4c81
2 parents ed54267 + 60a7ffc
commit d1d4c81
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/Makefile.am b/Makefile.am
@@ -21,7 +21,7 @@ README: README.md
 ChangeLog: configure.ac
 	echo "Missing Git" > ChangeLog;
 	if test -d $(srcdir)/.git; then \
-		which git && git log --stat --date=short --abbrev-commit | grep --invert-match '^ [[:alnum:].]' | git stripspace > ChangeLog \
+		which git && git log --stat --date=short --abbrev-commit | grep --invert-match '^ [[:alnum:].]' | git stripspace > ChangeLog; \
 	fi
 
 .PHONY: code-docs