fixed #13066 - Makefile: need to use override when appending to var…

…iable specified on the command-line (#6765) see https://www.gnu.org/software/make/manual/make.html#Override-Directive
danmar · Sep 18, 2024 · f88d2c8 · f88d2c8
1 parent 55c67a3
commit f88d2c8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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