From dcdb8f4a10f24477a7fd4cb52ddb3859d923bb66 Mon Sep 17 00:00:00 2001 From: helge Date: Sun, 29 Aug 2004 21:51:44 +0000 Subject: [PATCH] fixed some FHS issues git-svn-id: http://svn.opengroupware.org/SOPE/trunk@87 e4a50df8-12e2-0310-a44c-efbce7f8a7e3 --- sope-appserver/NGObjWeb/ChangeLog | 2 ++ sope-appserver/NGObjWeb/GNUmakefile | 4 ++++ sope-appserver/NGObjWeb/Version | 2 +- sope-core/NGExtensions/ChangeLog | 3 +++ sope-core/NGExtensions/NGBundleManager.m | 12 ++++++------ sope-core/NGExtensions/Version | 2 +- sope-mime/NGImap4/NGImap4Client.m | 1 - 7 files changed, 17 insertions(+), 9 deletions(-) diff --git a/sope-appserver/NGObjWeb/ChangeLog b/sope-appserver/NGObjWeb/ChangeLog index 572184a2..9a29fdb5 100644 --- a/sope-appserver/NGObjWeb/ChangeLog +++ b/sope-appserver/NGObjWeb/ChangeLog @@ -1,5 +1,7 @@ 2004-08-29 Helge Hess + * GNUmakefile: properly setup bundle path (v4.3.19) + * v4.3.18 * Templates/WOApplication+Builders.m: also look in diff --git a/sope-appserver/NGObjWeb/GNUmakefile b/sope-appserver/NGObjWeb/GNUmakefile index 7d2481ee..866102af 100644 --- a/sope-appserver/NGObjWeb/GNUmakefile +++ b/sope-appserver/NGObjWeb/GNUmakefile @@ -6,7 +6,11 @@ include ./Version GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_LOCAL_ROOT) LIBRARY_NAME = libNGObjWeb +ifeq ($(FHS_INSTALL_ROOT),) RESOURCES_DIR = $(GNUSTEP_RESOURCES)/NGObjWeb +else +RESOURCES_DIR = $(FHS_INSTALL_ROOT)/share/sope-4.3/ngobjweb +endif libNGObjWeb_CPPFLAGS += -pipe -DCOMPILING_NGOBJWEB=1 diff --git a/sope-appserver/NGObjWeb/Version b/sope-appserver/NGObjWeb/Version index 1494d0b4..4bb06710 100644 --- a/sope-appserver/NGObjWeb/Version +++ b/sope-appserver/NGObjWeb/Version @@ -1,6 +1,6 @@ # version file -SUBMINOR_VERSION:=18 +SUBMINOR_VERSION:=19 # v4.2.413 requires libSaxObjC v4.2.33 # v4.2.341 requires libNGExtensions v4.2.77 diff --git a/sope-core/NGExtensions/ChangeLog b/sope-core/NGExtensions/ChangeLog index 58b25049..ddbb2d66 100644 --- a/sope-core/NGExtensions/ChangeLog +++ b/sope-core/NGExtensions/ChangeLog @@ -1,5 +1,8 @@ 2004-08-29 Helge Hess + * NGBundleManager.m: fixed an issue when running without GNUstep + environment (v4.3.110) + * v4.3.109 * NGBundleManager.m: look for bundles in GNUSTEP_PATHPREFIX_LIST and diff --git a/sope-core/NGExtensions/NGBundleManager.m b/sope-core/NGExtensions/NGBundleManager.m index c2ab346f..6737371f 100644 --- a/sope-core/NGExtensions/NGBundleManager.m +++ b/sope-core/NGExtensions/NGBundleManager.m @@ -299,10 +299,10 @@ static BOOL debugOn = NO; } if (paths) [self->bundleSearchPaths addObjectsFromArray:paths]; - else + else if (debugOn) NSLog(@"Note: NGBundlePath default is not configured."); - - // look into environment + + /* look into environment */ paths = [[pi environment] objectForKey:@"NGBundlePath"]; if (paths) { @@ -330,14 +330,14 @@ static BOOL debugOn = NO; if ((tmp = [env objectForKey:@"GNUSTEP_PATHPREFIX_LIST"]) == nil) tmp = [env objectForKey:@"GNUSTEP_PATHLIST"]; tmp = [tmp componentsSeparatedByString:@":"]; - + for (i = 0; i < count; i++) { p = [tmp objectAtIndex:i]; p = [p stringByAppendingPathComponent:@"Library"]; p = [p stringByAppendingPathComponent:@"Bundles"]; if ([self->bundleSearchPaths containsObject:p]) continue; - - [self->bundleSearchPaths addObject:p]; + + if (p) [self->bundleSearchPaths addObject:p]; } #endif } diff --git a/sope-core/NGExtensions/Version b/sope-core/NGExtensions/Version index 0ce3d16d..8e0992af 100644 --- a/sope-core/NGExtensions/Version +++ b/sope-core/NGExtensions/Version @@ -1,5 +1,5 @@ # $Id$ -SUBMINOR_VERSION:=109 +SUBMINOR_VERSION:=110 # v4.2.72 requires libEOControl v4.2.39 diff --git a/sope-mime/NGImap4/NGImap4Client.m b/sope-mime/NGImap4/NGImap4Client.m index 879ac19c..d2ab39dd 100644 --- a/sope-mime/NGImap4/NGImap4Client.m +++ b/sope-mime/NGImap4/NGImap4Client.m @@ -18,7 +18,6 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -// $Id$ #include -- 2.39.5