From e7c7d32277dd4ab3b381f9d5daa03e4b2ded75d1 Mon Sep 17 00:00:00 2001 From: Kaz Kylheku Date: Fri, 7 Aug 2015 21:42:31 -0700 Subject: * Makefile (SRCS): When top_srcdir is blank, elide the entire --work-tree argument to git. On Cygwin, git throws a strange error message when --work-tree is given a blank argument. --- ChangeLog | 6 ++++++ Makefile | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index c3c7cba4..5e20e156 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2015-08-07 Kaz Kylheku + + * Makefile (SRCS): When top_srcdir is blank, elide the entire + --work-tree argument to git. On Cygwin, git throws a strange error + message when --work-tree is given a blank argument. + 2015-08-07 Kaz Kylheku * stream.c: Include header for iswprint. diff --git a/Makefile b/Makefile index 80c22556..b6e98487 100644 --- a/Makefile +++ b/Makefile @@ -57,7 +57,8 @@ EXTRA_OBJS-$(add_win_res) += win/txr.res ifneq ($(have_git),) SRCS := $(addprefix $(top_srcdir),\ $(filter-out lex.yy.c y.tab.c y.tab.h,\ - $(shell git --work-tree=$(top_srcdir) \ + $(shell git $(if $(top_srcdir), \ + --work-tree=$(top_srcdir)) \ --git-dir=$(top_srcdir).git \ ls-files "*.c" "*.h" "*.l" "*.y"))) endif -- cgit v1.2.3