Fix error copying directories.

Fix bundle for base library.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@22621 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
rfm 2006-03-08 14:25:55 +00:00
parent e11c9a4dce
commit b7533dd479
3 changed files with 16 additions and 9 deletions

View file

@ -712,8 +712,6 @@ _bundle_load_callback(Class theClass, struct objc_category *theCategory)
env = [[NSProcessInfo processInfo] environment];
if (env)
{
NSArray *paths;
NSMutableString *system = nil;
NSString *str;
if ((str = [env objectForKey: @"GNUSTEP_TARGET_CPU"]) != nil)
@ -734,15 +732,10 @@ _bundle_load_callback(Class theClass, struct objc_category *theCategory)
if ((str = [env objectForKey: @"LIBRARY_COMBO"]) != nil)
library_combo = RETAIN(str);
paths = NSSearchPathForDirectoriesInDomains(GSLibrariesDirectory,
NSSystemDomainMask, YES);
if ((paths != nil) && ([paths count] > 0))
system = RETAIN([paths objectAtIndex: 0]);
_launchDirectory = RETAIN([[NSFileManager defaultManager]
currentDirectoryPath]);
_gnustep_bundle = RETAIN([self bundleWithPath: system]);
_gnustep_bundle = RETAIN([self bundleForLibrary: @"gnustep-base"]);
#if 0
_loadingBundle = [self mainBundle];