From 17be2c0fbd946936e3232ad767c3f3b0d4e1470e Mon Sep 17 00:00:00 2001 From: helge Date: Tue, 16 Aug 2005 15:29:06 +0000 Subject: [PATCH] fixed install locations on OSX git-svn-id: http://svn.opengroupware.org/SOPE/trunk@1035 e4a50df8-12e2-0310-a44c-efbce7f8a7e3 --- sope-appserver/SoOFS/GNUmakefile.preamble | 4 ++++ sope-appserver/WEExtensions/GNUmakefile.preamble | 6 ++++++ sope-appserver/WOExtensions/GNUmakefile.preamble | 6 ++++++ sope-appserver/WOXML/GNUmakefile.preamble | 6 ++++++ sope-gdl1/GDLAccess/GNUmakefile.preamble | 6 ++++++ sope-gdl1/GDLContentStore/GNUmakefile.preamble | 4 ++++ sope-ical/NGiCal/GNUmakefile.preamble | 4 ++++ sope-ldap/NGLdap/GNUmakefile.preamble | 4 ++++ 8 files changed, 40 insertions(+) diff --git a/sope-appserver/SoOFS/GNUmakefile.preamble b/sope-appserver/SoOFS/GNUmakefile.preamble index f2c930b8..6a8f8162 100644 --- a/sope-appserver/SoOFS/GNUmakefile.preamble +++ b/sope-appserver/SoOFS/GNUmakefile.preamble @@ -6,6 +6,10 @@ ADDITIONAL_OBJCFLAGS += -Wall -Wno-import -Wno-protocol SOPE_ROOT=../.. CORE_ROOT=$(SOPE_ROOT)/sope-core +ifeq ($(FOUNDATION_LIB),apple) +SoOFS_INSTALL_DIR = /Library/Frameworks/ +endif + ADDITIONAL_INCLUDE_DIRS += \ -I. \ -I.. \ diff --git a/sope-appserver/WEExtensions/GNUmakefile.preamble b/sope-appserver/WEExtensions/GNUmakefile.preamble index 06bbda2a..7a46e7e7 100644 --- a/sope-appserver/WEExtensions/GNUmakefile.preamble +++ b/sope-appserver/WEExtensions/GNUmakefile.preamble @@ -2,6 +2,12 @@ SOPE_ROOT=../.. +ifeq ($(FOUNDATION_LIB),apple) +ifeq ($(frameworks),yes) +WEExtensions_INSTALL_DIR = /Library/Frameworks/ +endif +endif + ADDITIONAL_CPPFLAGS += -Wall ADDITIONAL_INCLUDE_DIRS += \ -I.. -I$(SOPE_ROOT) -I../NGObjWeb \ diff --git a/sope-appserver/WOExtensions/GNUmakefile.preamble b/sope-appserver/WOExtensions/GNUmakefile.preamble index a1802b22..d475d205 100644 --- a/sope-appserver/WOExtensions/GNUmakefile.preamble +++ b/sope-appserver/WOExtensions/GNUmakefile.preamble @@ -2,6 +2,12 @@ SOPE_ROOT=../.. +ifeq ($(FOUNDATION_LIB),apple) +ifeq ($(frameworks),yes) +WOExtensions_INSTALL_DIR = /Library/Frameworks/ +endif +endif + ADDITIONAL_CPPFLAGS += -Wall ADDITIONAL_INCLUDE_DIRS += \ -I.. -I../.. \ diff --git a/sope-appserver/WOXML/GNUmakefile.preamble b/sope-appserver/WOXML/GNUmakefile.preamble index 30f4ddfb..628d4603 100644 --- a/sope-appserver/WOXML/GNUmakefile.preamble +++ b/sope-appserver/WOXML/GNUmakefile.preamble @@ -2,6 +2,12 @@ SOPE_ROOT=../.. +ifeq ($(FOUNDATION_LIB),apple) +ifeq ($(frameworks),yes) +WOXML_INSTALL_DIR = /Library/Frameworks/ +endif +endif + libWOXML_SOVERSION=$(MAJOR_VERSION).$(MINOR_VERSION) libWOXML_VERSION=$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBMINOR_VERSION) diff --git a/sope-gdl1/GDLAccess/GNUmakefile.preamble b/sope-gdl1/GDLAccess/GNUmakefile.preamble index b8b6232b..ad5fc654 100644 --- a/sope-gdl1/GDLAccess/GNUmakefile.preamble +++ b/sope-gdl1/GDLAccess/GNUmakefile.preamble @@ -2,6 +2,12 @@ SOPE_ROOT=../.. +ifeq ($(FOUNDATION_LIB),apple) +ifeq ($(frameworks),yes) +GDLAccess_INSTALL_DIR = /Library/Frameworks/ +endif +endif + ADDITIONAL_CPPFLAGS += -Wall ADDITIONAL_CPPFLAGS += \ diff --git a/sope-gdl1/GDLContentStore/GNUmakefile.preamble b/sope-gdl1/GDLContentStore/GNUmakefile.preamble index 5e5e6002..848e2f9d 100644 --- a/sope-gdl1/GDLContentStore/GNUmakefile.preamble +++ b/sope-gdl1/GDLContentStore/GNUmakefile.preamble @@ -2,6 +2,10 @@ SOPE_ROOT=../.. +ifeq ($(FOUNDATION_LIB),apple) +GDLContentStore_INSTALL_DIR = /Library/Frameworks/ +endif + ADDITIONAL_CPPFLAGS += -Wall ADDITIONAL_INCLUDE_DIRS += -I. -I.. diff --git a/sope-ical/NGiCal/GNUmakefile.preamble b/sope-ical/NGiCal/GNUmakefile.preamble index c7e2334c..649f3bd1 100644 --- a/sope-ical/NGiCal/GNUmakefile.preamble +++ b/sope-ical/NGiCal/GNUmakefile.preamble @@ -2,6 +2,10 @@ SOPE_ROOT=../.. +ifeq ($(FOUNDATION_LIB),apple) +NGiCal_INSTALL_DIR = /Library/Frameworks/ +endif + ADDITIONAL_CPPFLAGS += \ -Wall -DCOMPILE_FOR_GSTEP_MAKE=1 \ -DSOPE_MAJOR_VERSION=$(MAJOR_VERSION) \ diff --git a/sope-ldap/NGLdap/GNUmakefile.preamble b/sope-ldap/NGLdap/GNUmakefile.preamble index e374b012..2c287dc7 100644 --- a/sope-ldap/NGLdap/GNUmakefile.preamble +++ b/sope-ldap/NGLdap/GNUmakefile.preamble @@ -2,6 +2,10 @@ SOPE_ROOT=../.. +ifeq ($(FOUNDATION_LIB),apple) +NGLdap_INSTALL_DIR = /Library/Frameworks/ +endif + ADDITIONAL_INCLUDE_DIRS += \ -I.. \ -I../../sope-core/NGExtensions \ -- 2.39.5