X-Git-Url: https://git.ladys.computer/Shushe/blobdiff_plain/4a0e5671fe44e12a563c4b8403b87db66566f005..d94cfdc987aba3983f4945d59b02cbb062573432:/GNUmakefile?ds=inline

diff --git a/GNUmakefile b/GNUmakefile
index e862477..174f340 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -134,11 +134,13 @@ MAGICDIR := $(patsubst ./%,%,$(THISDIR)/magic)
 
 # Configuration of `find´.
 #
-# By default, `find´ will follow symlinks and use extended regular
-# expressions, ignoring hidden files and those which begin with a
-# period.
-FINDOPTS := -LE
+# By default, `find´ will not follow symlinks and will use extended
+# regular expressions, ignoring hidden files and those which begin with
+# a period.
+FINDOPTS := -PE
 FINDRULES := -flags -nohidden -and -not -name '.*'
+FINDINCLUDEOPTS := $(FINDOPTS)
+FINDINCLUDERULES := $(FINDRULES)
 
 # The list of parsers for plaintext file types.
 #
@@ -193,7 +195,7 @@ override silent := $(if $(VERBOSE),,@)
 
 # (callable) Escape special characters for use in sed regular
 # expressions.
-override sedesc = $(subst $$,\$$,$(subst *,\*,$(subst .,\.,$(subst [,\[,$(subst ^,\^,$(subst \,\\,$1))))))
+override sedesc = $(subst /,[/],$(subst $$,\$$,$(subst *,\*,$(subst .,\.,$(subst [,\[,$(subst ^,\^,$(subst \,\\,$1)))))))
 
 # Collect all of the applicable includes from the includes directory.
 sourceincludes := $(shell $(FIND) $(FINDOPTS) $(INCLUDEDIR) -type f '(' $(FINDRULES) ')')
@@ -302,7 +304,7 @@ help:
 	$(silent)$(PRINTF) '%b' '$(subst $(newline),\n,$(makefileinfo))'
 
 # Compile all files, or error if any are recursive.
-all: $(call compiled,$(recursivefiles) $(compilablefiles) $(assetfiles)) ;
+all: $(call compiled,$(recursivefiles) $(compilablefiles) $(filter $(sourcefiles),$(assetfiles))) ;
 
 # Destroy buildfiles.
 clean:
@@ -313,7 +315,7 @@ gone:
 	$(silent)$(RM) -rf $(BUILDDIR)/ $(call compiled,$(recursivefiles) $(compilablefiles))
 
 # Install the compiled files into `DESTDIR´.
-install: $(call installed,$(recursivefiles) $(compilablefiles) $(assetfiles)) ;
+install: $(call installed,$(recursivefiles) $(compilablefiles) $(filter $(sourcefiles),$(assetfiles))) ;
 
 # List all source files and includes and their computed types.
 list:
@@ -378,8 +380,7 @@ endif
 $(BUILDDIR)/magic.mgc: $(wildcard $(MAGICDIR)/*)
 	@$(ECHO) "Compiling new magic…"
 	$(silent)$(call ensuredirectory,$(dir $@))
-	$(silent)$(FILE) -C -m $(call quote,$(MAGICDIR))
-	$(silent)$(MV) $(call quote,$(MAGICDIR).mgc) $(call quote,$(BUILDDIR)/magic.mgc)
+	$(silent)cd $(call quote,$(BUILDDIR)) && $(FILE) -C -m $(call quote,$(realpath $(MAGICDIR)))
 
 # Generate the main parser.
 $(BUILDDIR)/parser.catalog: $(PARSERS)