* 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

diff --git a/Main/SOGoProductLoader.m b/Main/SOGoProductLoader.m
index c5ed1ef24ad700f6dd4b25808b4c354b6ab5b847..dc63fce39be9c7538cf775d04aed8c9fd07cf059 100644 (file)
--- 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 {