* Model/GNUmakefile: do not overwrite ADDITIONAL_INCLUDE_DIRS

value to help RPM build. In spec file ADDITIONAL_INCLUDE_DIRS can be sat to subdirectories which are create by RPM build tool.
gnustep · Mar 12, 2020 · 70a001d · 70a001d
1 parent a655fe1
commit 70a001d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,9 @@
+2020-03-12  Sergii Stoian  <[email protected]>
+
+	* Model/GNUmakefile: do not overwrite ADDITIONAL_INCLUDE_DIRS
+	value to help RPM build. In spec file ADDITIONAL_INCLUDE_DIRS can be sat
+	to subdirectories which are create by RPM build tool.
+
 2020-03-05  Sergii Stoian  <[email protected]>
 
 	* Source/NSWindow.m (_applyFrame:): new helper method to do actual

diff --git a/Model/GNUmakefile b/Model/GNUmakefile
@@ -66,9 +66,9 @@ ADDITIONAL_CPPFLAGS += $(RUNTIME_DEFINE) $(GUI_DEFINE) $(BACKEND_DEFINE)
 ADDITIONAL_LIB_DIRS += -L$(GNUSTEP_OBJ_DIR) 
 ifeq ($(GUI_LIB), gnu)
   ADDITIONAL_LIB_DIRS += -L../Source/$(GNUSTEP_OBJ_DIR)
-  ADDITIONAL_INCLUDE_DIRS = -I../Headers/Additions -I../Headers
+  ADDITIONAL_INCLUDE_DIRS += -I../Headers/Additions -I../Headers
 else
-  ADDITIONAL_INCLUDE_DIRS = -I../Headers/Additions
+  ADDITIONAL_INCLUDE_DIRS += -I../Headers/Additions
 endif
 
 ADDITIONAL_OBJC_FLAGS += $(BACKEND_DEFINE)