Quote source and include directories

[Shushe] / GNUmakefile

diff --git a/GNUmakefile b/GNUmakefile
index ab8e828b23917c7e45be1c5a76df49df3bead98b..cf2a538d312ee273432dc5757a55035fd6032fe2 100644 (file)
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -225,11 +225,11 @@ override pathenc = $(foreach path,$1,$(subst $(space),/,$(call perenc,$(subst /,
 
 # (overridable) Collect all of the applicable includes from the
 # includes directory.
 
 # (overridable) Collect all of the applicable includes from the
 # includes directory.

-sourceincludes := $(shell $(FIND) $(FINDOPTS) $(INCLUDEDIR) -type f '(' $(FINDRULES) ')')
+sourceincludes := $(shell $(FIND) $(FINDOPTS) $(foreach dir,$(INCLUDEDIR),$(call quote,$(dir))) -type f '(' $(FINDRULES) ')')

 
 # (overridable) Collect all of the applicable source files from the
 # source directory, removing any which are also includes.
 
 # (overridable) Collect all of the applicable source files from the
 # source directory, removing any which are also includes.

-sourcefiles := $(filter-out $(sourceincludes),$(shell $(FIND) $(FINDOPTS) $(SRCDIR) -type f '(' $(FINDRULES) ')'))
+sourcefiles := $(filter-out $(sourceincludes),$(shell $(FIND) $(FINDOPTS) $(foreach dir,$(SRCDIR),$(call quote,$(dir))) -type f '(' $(FINDRULES) ')'))

 
 ifdef GIT
 ifneq ($(wildcard $(THISDIR)/.git),)
 
 ifdef GIT
 ifneq ($(wildcard $(THISDIR)/.git),)