From 6e20caf40e6847b0535cb0f5c1e3890ec250ce2d Mon Sep 17 00:00:00 2001
From: firewave <firewave@users.noreply.github.com>
Date: Mon, 2 Sep 2024 16:23:29 +0200
Subject: [PATCH] fixed #13066 - Makefile: need to use `override` when
 appending to variable specified on the command-line

see https://www.gnu.org/software/make/manual/make.html#Override-Directive
---
 Makefile              | 2 +-
 tools/dmake/dmake.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 7124e4f9482..0e6978963af 100644
--- a/Makefile
+++ b/Makefile
@@ -40,7 +40,7 @@ ifndef CPPFLAGS
 endif
 
 ifdef FILESDIR
-    CPPFLAGS+=-DFILESDIR=\"$(FILESDIR)\"
+    override CPPFLAGS+=-DFILESDIR=\"$(FILESDIR)\"
 endif
 
 RDYNAMIC=-rdynamic
diff --git a/tools/dmake/dmake.cpp b/tools/dmake/dmake.cpp
index 49901e54cfb..f57a4f790df 100644
--- a/tools/dmake/dmake.cpp
+++ b/tools/dmake/dmake.cpp
@@ -599,7 +599,7 @@ int main(int argc, char **argv)
 
     // explicit files dir..
     fout << "ifdef FILESDIR\n"
-         << "    CPPFLAGS+=-DFILESDIR=\\\"$(FILESDIR)\\\"\n"
+         << "    override CPPFLAGS+=-DFILESDIR=\\\"$(FILESDIR)\\\"\n"
          << "endif\n\n";
 
     // enable backtrac