From bb66bd148290f4841e8d6dddc64c894fc0ec31c1 Mon Sep 17 00:00:00 2001 From: richard Date: Wed, 12 Aug 1998 15:07:03 +0000 Subject: [PATCH] Update reading of environment git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@2919 72102866-910b-0410-8b05-ffd578937521 --- Source/NSBundle.m | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/Source/NSBundle.m b/Source/NSBundle.m index fa6ab8f4a..4e21be48d 100644 --- a/Source/NSBundle.m +++ b/Source/NSBundle.m @@ -225,20 +225,22 @@ _bundle_load_callback(Class theClass, Category *theCategory) { NSString *str; - str = [env objectForKey: @"GNUSTEP_TARGET_DIR"]; - if (str) + if ((str = [env objectForKey: @"GNUSTEP_TARGET_DIR"]) != nil) + gnustep_target_dir = [str retain]; + else if ((str = [env objectForKey: @"GNUSTEP_HOST_DIR"]) != nil) gnustep_target_dir = [str retain]; - str = [env objectForKey: @"GNUSTEP_TARGET_CPU"]; - if (str) + if ((str = [env objectForKey: @"GNUSTEP_TARGET_CPU"]) != nil) + gnustep_target_cpu = [str retain]; + else if ((str = [env objectForKey: @"GNUSTEP_HOST_CPU"]) != nil) gnustep_target_cpu = [str retain]; - str = [env objectForKey: @"GNUSTEP_TARGET_OS"]; - if (str) + if ((str = [env objectForKey: @"GNUSTEP_TARGET_OS"]) != nil) + gnustep_target_os = [str retain]; + else if ((str = [env objectForKey: @"GNUSTEP_HOST_OS"]) != nil) gnustep_target_os = [str retain]; - str = [env objectForKey: @"LIBRARY_COMBO"]; - if (str) + if ((str = [env objectForKey: @"LIBRARY_COMBO"]) != nil) library_combo = [str retain]; } }