X-Git-Url: https://git.ladys.computer/Shushe/blobdiff_plain/dd8581764fb0ddb86e84d68f3a90ddfe3b96102f..4e4c927c458dd77fd0f6cdac5be14f964525e8b1:/GNUmakefile?ds=inline diff --git a/GNUmakefile b/GNUmakefile index ab8e828..ee342ec 100644 --- 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Ā“. -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. @@ -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. -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. -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),)