fixed install locations on OSX

git-svn-id: http://svn.opengroupware.org/SOPE/trunk@1035 e4a50df8-12e2-0310-a44c-efbce7f8a7e3

diff --git a/sope-appserver/SoOFS/GNUmakefile.preamble b/sope-appserver/SoOFS/GNUmakefile.preamble
index f2c930b814eeba0bea0e4c8db540c4adb0e4eff8..6a8f81629e1821309bb83595b51aba6d989143cc 100644 (file)
--- 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 06bbda2a79c47f483143945a1964b13938c71859..7a46e7e7b584275b6ce50f8449853368ff290dbb 100644 (file)
--- 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 a1802b22784e7057841fd5161275540e25339d24..d475d20533287037eed2f0444fee2d5c1c7ec6b6 100644 (file)
--- 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 30f4ddfbb32fd9971a4262c9deb462d5bac94b3a..628d4603a40444a6f433e053be43dc079804bcfb 100644 (file)
--- 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 b8b6232ba44f38e2f3b2fe6d07f1c9c82ead1a34..ad5fc654b850b5068ba0fee19549d0f34a71d162 100644 (file)
--- 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 5e5e6002d56037b43aa18352a785b697661dc56e..848e2f9d82b36502662816a23488fc9973e938b7 100644 (file)
--- 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 c7e2334c3e39941aa4c49665ffe380194e297855..649f3bd1cf4c545f206312352f2aa8a6f32d4f9d 100644 (file)
--- 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 e374b012c2e52bc8648627c594c9ba9d65fd117b..2c287dc71d8f8fe0d686f648ccb7d12e156df811 100644 (file)
--- 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  \