From 70a001d17f96f8858edc4b6600bb4df14498b73a Mon Sep 17 00:00:00 2001 From: Sergii Stoian Date: Thu, 12 Mar 2020 11:55:25 +0200 Subject: [PATCH] * 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. --- ChangeLog | 6 ++++++ Model/GNUmakefile | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 89670be27d..2af5db9602 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2020-03-12 Sergii Stoian + + * 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 * Source/NSWindow.m (_applyFrame:): new helper method to do actual diff --git a/Model/GNUmakefile b/Model/GNUmakefile index 3d9014c35e..4f61e4de25 100644 --- 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)