From 2e3dc07a59708fa2a2828fc14c4091ca674772c3 Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Thu, 8 Feb 2007 16:24:36 +0000 Subject: [PATCH] Monotone-Parent: 4f222b50f7fa13fbfac1e7b3ffae8e63d5b06873 Monotone-Revision: ebf9c6d48584b1bd57997689934388548648dbfe Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2007-02-08T16:24:36 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 6 ++++++ OGoContentStore/GNUmakefile | 2 +- Protocols/common.make | 2 +- SoObjects/common.make | 3 ++- UI/common.make | 2 +- 5 files changed, 11 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8988c320a..95ecd44b4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2007-02-08 Wolfgang Sourdeau + + * OGoContentStore/GNUmakefile, Protocols/common.make, + SoObjects/common.make, UI/common.make: install in + GNUSTEP_INSTALLATION_DIR instead of GNUSTEP_USER_DIR. + 2007-02-07 Ludovic Marcotte * UI/Scheduler/English.lproj/Localizable.strings diff --git a/OGoContentStore/GNUmakefile b/OGoContentStore/GNUmakefile index 5807b690d..d8a20b4f9 100644 --- a/OGoContentStore/GNUmakefile +++ b/OGoContentStore/GNUmakefile @@ -7,7 +7,7 @@ include ./Version LIBRARY_NAME = libOGoContentStore TOOL_NAME = test_quick_extract -TYPEMODELS_DIR = $(GNUSTEP_SYSTEM_ROOT)/Library/OCSTypeModels/ +TYPEMODELS_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/OCSTypeModels/ libOGoContentStore_HEADER_FILES_DIR = . libOGoContentStore_HEADER_FILES_INSTALL_DIR = /OGoContentStore diff --git a/Protocols/common.make b/Protocols/common.make index 8d43914d6..03483a6d1 100644 --- a/Protocols/common.make +++ b/Protocols/common.make @@ -6,7 +6,7 @@ include ../../Version include ./Version BUNDLE_EXTENSION = .SOGo -BUNDLE_INSTALL_DIR = $(GNUSTEP_USER_ROOT)/Library/SOGo-$(MAJOR_VERSION).$(MINOR_VERSION) +BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/SOGo-$(MAJOR_VERSION).$(MINOR_VERSION) ADDITIONAL_INCLUDE_DIRS += \ -I.. \ diff --git a/SoObjects/common.make b/SoObjects/common.make index fbedc5176..064352a90 100644 --- a/SoObjects/common.make +++ b/SoObjects/common.make @@ -6,7 +6,7 @@ include ../../Version include ./Version BUNDLE_EXTENSION = .SOGo -BUNDLE_INSTALL_DIR = $(GNUSTEP_USER_ROOT)/Library/SOGo-$(MAJOR_VERSION).$(MINOR_VERSION) +BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/SOGo-$(MAJOR_VERSION).$(MINOR_VERSION) WOBUNDLE_EXTENSION = $(BUNDLE_EXTENSION) WOBUNDLE_INSTALL_DIR = $(BUNDLE_INSTALL_DIR) @@ -20,6 +20,7 @@ ADDITIONAL_LIB_DIRS += \ -L../SOGo/$(GNUSTEP_OBJ_DIR)/ \ -L../../SOGo/$(GNUSTEP_OBJ_DIR)/ \ -L../../OGoContentStore/$(GNUSTEP_OBJ_DIR)/ \ + -L../../SOPE/NGCards/$(GNUSTEP_OBJ_DIR)/ \ -L/usr/local/lib BUNDLE_LIBS += \ diff --git a/UI/common.make b/UI/common.make index 0481cca4c..1efe93827 100644 --- a/UI/common.make +++ b/UI/common.make @@ -6,7 +6,7 @@ include ../../Version include ./Version BUNDLE_EXTENSION = .SOGo -BUNDLE_INSTALL_DIR = $(GNUSTEP_USER_ROOT)/Library/SOGo-$(MAJOR_VERSION).$(MINOR_VERSION) +BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/SOGo-$(MAJOR_VERSION).$(MINOR_VERSION) ADDITIONAL_INCLUDE_DIRS += \ -I.. \