Disallow a few more characters in file·names

[Shushe] / GNUmakefile

diff --git a/GNUmakefile b/GNUmakefile
index ab8e828b23917c7e45be1c5a76df49df3bead98b..ee342ec1a1f627026ce2df8f527b0775ddd3a3c0 100644 (file)
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -150,7 +150,7 @@ MAGICDIR := $(patsubst ./%,%,$(THISDIR)/magic)
 #
 # By default, `find´ will ignore hidden files, those which begin with a
 # period, and those which are likely to cause problems for `make´.
 #
 # By default, `find´ will ignore hidden files, those which begin with a
 # period, and those which are likely to cause problems for `make´.

-FINDRULES := -flags -nohidden -and ! '(' '(' -name '[.-]*' -or -name '*[:|$$%]*' ')' -and -prune ')'
+FINDRULES := -flags -nohidden -and ! '(' '(' -name '[.-]*' -or -name '*[][*?:|$$%\#;]*' ')' -and -prune ')'

 FINDINCLUDERULES := $(FINDRULES)
 
 # The list of parsers for plaintext file types.
 FINDINCLUDERULES := $(FINDRULES)
 
 # The list of parsers for plaintext file types.


@@ -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) $(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) $(foreach dir,$(SRCDIR),$(call quote,$(dir))) -type f '(' $(FINDRULES) ')'))

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