From df41d00f325e19919ff0e8c1901c85c01ce84774 Mon Sep 17 00:00:00 2001 From: helge Date: Tue, 9 Aug 2005 23:46:59 +0000 Subject: [PATCH] fixed OSX installdir git-svn-id: http://svn.opengroupware.org/SOPE/trunk@1021 e4a50df8-12e2-0310-a44c-efbce7f8a7e3 --- sope-core/EOControl/GNUmakefile.preamble | 4 ++++ sope-core/EOCoreData/GNUmakefile.preamble | 4 ++++ sope-core/NGExtensions/GNUmakefile | 1 - sope-core/NGExtensions/GNUmakefile.preamble | 4 ++++ sope-core/NGStreams/GNUmakefile.preamble | 4 ++++ 5 files changed, 16 insertions(+), 1 deletion(-) diff --git a/sope-core/EOControl/GNUmakefile.preamble b/sope-core/EOControl/GNUmakefile.preamble index d4cdb0f9..93f8b97c 100644 --- a/sope-core/EOControl/GNUmakefile.preamble +++ b/sope-core/EOControl/GNUmakefile.preamble @@ -1,5 +1,9 @@ # GNUstep Makefile +ifeq ($(FOUNDATION_LIB),apple) +EOControl_INSTALL_DIR = /Library/Frameworks/ +endif + libEOControl_INCLUDE_DIRS += -I.. ADDITIONAL_CPPFLAGS += -Wall -funsigned-char diff --git a/sope-core/EOCoreData/GNUmakefile.preamble b/sope-core/EOCoreData/GNUmakefile.preamble index 62e1aff0..cf89f7f3 100644 --- a/sope-core/EOCoreData/GNUmakefile.preamble +++ b/sope-core/EOCoreData/GNUmakefile.preamble @@ -1,5 +1,9 @@ # GNUstep Makefile +ifeq ($(FOUNDATION_LIB),apple) +EOCoreData_INSTALL_DIR = /Library/Frameworks/ +endif + ADDITIONAL_CPP_FLAGS += -Wall -Wno-import -Wno-protocol -O2 libEOCoreData_INCLUDE_DIRS += -I.. diff --git a/sope-core/NGExtensions/GNUmakefile b/sope-core/NGExtensions/GNUmakefile index faccdd74..ab371783 100644 --- a/sope-core/NGExtensions/GNUmakefile +++ b/sope-core/NGExtensions/GNUmakefile @@ -146,7 +146,6 @@ libNGExtensions_HEADER_FILES += \ # framework support - NGExtensions_HEADER_FILES_DIR = NGExtensions NGExtensions_HEADER_FILES = $(libNGExtensions_HEADER_FILES) NGExtensions_OBJC_FILES = $(libNGExtensions_OBJC_FILES) diff --git a/sope-core/NGExtensions/GNUmakefile.preamble b/sope-core/NGExtensions/GNUmakefile.preamble index 5c3c0fb5..36baadc9 100644 --- a/sope-core/NGExtensions/GNUmakefile.preamble +++ b/sope-core/NGExtensions/GNUmakefile.preamble @@ -1,5 +1,9 @@ # compilation settings +ifeq ($(FOUNDATION_LIB),apple) +NGExtensions_INSTALL_DIR = /Library/Frameworks/ +endif + ADDITIONAL_INCLUDE_DIRS += \ -I./NGExtensions/ \ -I./FdExt.subproj/ -I./EOExt.subproj/ diff --git a/sope-core/NGStreams/GNUmakefile.preamble b/sope-core/NGStreams/GNUmakefile.preamble index 25f2e99a..e3e00ec4 100644 --- a/sope-core/NGStreams/GNUmakefile.preamble +++ b/sope-core/NGStreams/GNUmakefile.preamble @@ -1,5 +1,9 @@ # compilation settings +ifeq ($(FOUNDATION_LIB),apple) +NGStreams_INSTALL_DIR = /Library/Frameworks/ +endif + libNGStreams_INCLUDE_DIRS += \ -I$(GNUSTEP_TARGET_CPU)/$(GNUSTEP_TARGET_OS) \ -INGStreams \ -- 2.39.5