[vlc-commits] doc: fix make distcheck with git worktrees

Romain Vimont git at videolan.org
Tue Jan 21 11:55:36 CET 2020


vlc/vlc-3.0 | branch: master | Romain Vimont <rom1v at videolabs.io> | Mon Jan 13 14:08:12 2020 +0100| [3ab06ae6a38336a70f4d1db76e409d8c9f593908] | committer: Thomas Guillem

doc: fix make distcheck with git worktrees

In a git worktree, .git is a regular (text) file, not a directory.

Signed-off-by: Thomas Guillem <thomas at gllm.fr>
(cherry picked from commit abba5c2972202e2ad7ee81d595d3c455770e413f)

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=3ab06ae6a38336a70f4d1db76e409d8c9f593908
---

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

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 174de95d97..bf68345147 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -74,7 +74,7 @@ doc: Doxyfile
 	doxygen
 
 $(CHANGELOGS): Makefile.am
-	if test -d "$(top_srcdir)/.git"; then \
+	if test -e "$(top_srcdir)/.git"; then \
 		y="$@"; y="$${y##ChangeLog-}" ; \
 		git --git-dir="$(top_srcdir)/.git" log \
 			--since="$$y-01-01" \



More information about the vlc-commits mailing list