From 5de2dc59ce8bcb787bab24d6dda512ec67c50780 Mon Sep 17 00:00:00 2001 From: sreitenbach Date: Sun, 3 Feb 2008 19:22:42 +0000 Subject: [PATCH] * gnustep-make 2 compatibility, do not use GNUSTEP_PATHLIST to build lookup path git-svn-id: http://svn.opengroupware.org/SOGo/inverse/branches/1.0-gsmake2@1354 d1b88da0-ebda-0310-925b-ed51d893ca5b --- Main/SOGoProductLoader.m | 28 ++++++---------------------- 1 file changed, 6 insertions(+), 22 deletions(-) diff --git a/Main/SOGoProductLoader.m b/Main/SOGoProductLoader.m index c5ed1ef2..dc63fce3 100644 --- a/Main/SOGoProductLoader.m +++ b/Main/SOGoProductLoader.m @@ -80,28 +80,12 @@ } - (void)_addGNUstepSearchPathesToArray:(NSMutableArray *)ma { - NSDictionary *env; - id tmp; - - env = [[NSProcessInfo processInfo] environment]; - if ((tmp = [env objectForKey:@"GNUSTEP_PATHPREFIX_LIST"]) == nil) - tmp = [env objectForKey:@"GNUSTEP_PATHLIST"]; - - tmp = [tmp componentsSeparatedByString:@":"]; - if ([tmp count] > 0) { - NSEnumerator *e; - - e = [tmp objectEnumerator]; - while ((tmp = [e nextObject])) { - tmp = [tmp stringByAppendingPathComponent:@"Library"]; - tmp = [tmp stringByAppendingPathComponent:self->productDirectoryName]; - if (![ma containsObject:tmp]) - [ma addObject:tmp]; - } - } - else { - NSLog(@"%s: empty library search path !", __PRETTY_FUNCTION__); - } + NSEnumerator *libraryPaths; + NSString *directory; + + libraryPaths = [NSStandardLibraryPaths() objectEnumerator]; + while ((directory = [libraryPaths nextObject])) + [ma addObject: [directory stringByAppendingPathComponent:self->productDirectoryName]]; } - (void)_addFHSPathesToArray:(NSMutableArray *)ma { -- 2.39.5