From: Lady <redacted>
Date: Wed, 22 May 2024 04:26:34 +0000 (-0400)
Subject: Fix typeoffile
X-Git-Tag: 0.9.1~2
X-Git-Url: https://git.ladys.computer/Shushe/commitdiff_plain/5e96540e69e1b5bd59753284b26439419745168a?ds=sidebyside

Fix typeoffile

The old implementation switched some things around and probably would
not work if called with multiple files (it never was).
---

diff --git a/GNUmakefile b/GNUmakefile
index 6779aa7..f4161de 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -359,7 +359,7 @@ override plaintextfiles := $(filter-out $(xmlfiles),$(call filesoftype,$(plainte
 override assetfiles := $(filter-out $(xmlfiles) $(plaintextfiles),$(sourcefiles) $(sourceincludes))
 
 # (callable) Get the types of the given files.
-override typeoffile = $(patsubst $(foreach file,$1,$(file)|%),%,$(filter $(foreach file,$1,$(file)|%),$(types)))
+override typeoffile = $(foreach file,$1,$(patsubst $(file)|%,%,$(filter $(file)|%,$(types))))
 
 # Pair each source magic file with its location in the build directory.
 override magicpair := $(foreach magicfile,$(MAGIC),$(magicfile)|$(BUILDDIR)/magic/$(notdir $(magicfile)))