gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-05-30 16:30:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

Updates for the fact that GNUSTEP_USER_DIR is obsolete/ignored in current gnustep-make/gnustep-base

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@25941 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Nicola Pero 2008-01-14 10:39:21 +00:00
parent 5a9b3fcd87
commit cedc0cb3e4
6 changed files with 27 additions and 82 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Source/NSPathUtilities.m
View file

@ -142,7 +142,6 @@ static NSString *gnustep_is_flattened =
static NSString *gnustepConfigPath = nil;
static NSString *gnustepUserDir = nil;
static NSString *gnustepUserHome = nil;
static NSString *gnustepUserDefaultsDir = nil;
@ -332,7 +331,6 @@ static void ExtractValuesFromConfig(NSDictionary *config)
/*
* Move values out of the dictionary and into variables for rapid reference.
*/
ASSIGN_IF_SET(gnustepUserDir, c, @"GNUSTEP_USER_DIR");
ASSIGN_IF_SET(gnustepUserDefaultsDir, c, @"GNUSTEP_USER_DEFAULTS_DIR");
ASSIGN_PATH(gnustepMakefiles, c, @"GNUSTEP_MAKEFILES");
@ -423,6 +421,7 @@ static void ExtractValuesFromConfig(NSDictionary *config)
[c removeObjectForKey: @"GNUSTEP_LOCAL_ROOT"];
[c removeObjectForKey: @"GNUSTEP_SYSTEM_ROOT"];
[c removeObjectForKey: @"GNUSTEP_NETWORK_ROOT"];
[c removeObjectForKey: @"GNUSTEP_USER_DIR"];
if ([c count] > 0)
{
@ -437,10 +436,6 @@ static void ExtractValuesFromConfig(NSDictionary *config)
/*
* Set default locations for user files if necessary.
*/
if (gnustepUserDir == nil)
{
ASSIGN(gnustepUserDir, @GNUSTEP_TARGET_USER_DIR);
}
if (gnustepUserDefaultsDir == nil)
{
ASSIGN(gnustepUserDefaultsDir, @GNUSTEP_TARGET_USER_DEFAULTS_DIR);