Don’t try to install asset includes

[Shushe] / GNUmakefile

diff --git a/GNUmakefile b/GNUmakefile
index e8624778763b08e1aaefa0ea337ce16a3afaabaf..ea676dc3c4bfbd76257c069f824a2ffbcddf1324 100644 (file)
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -302,7 +302,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 +313,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 +378,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)