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

Small bugfix to last set of changes

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@21828 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-Macdonald 2005-10-16 04:08:12 +00:00
parent 53e6d8be6b
commit 4cd54ec88c
2 changed files with 16 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2005-10-16 Richard Frith-Macdonald <rfm@gnu.org>
* Source/NSPathUtilities.m: Set default value for defaults directory
(lost in last set of changes).
2005-10-15 Richard Frith-Macdonald <rfm@gnu.org>
* Source/NSPathUtilities.m: Fix retain/release error exposed by recent

24
Source/NSPathUtilities.m
View file

@ -103,11 +103,6 @@
#ifndef GNUSTEP_CONFIG_FILE
# define GNUSTEP_CONFIG_FILE /etc/GNUstep/GNUstep.conf
#endif
/* The standard path for user Defaults files */
#define DEFAULT_DEFAULTS_PATH @"Defaults"
/* The standard path to user GNUstep resources */
#define DEFAULT_USER_ROOT @"GNUstep"
static NSString *gnustep_target_cpu =
#ifdef GNUSTEP_TARGET_CPU
@ -272,36 +267,39 @@ static void ExtractValuesFromConfig(NSDictionary *config)
#endif /* OPTION_PLATFORM SUPPORT */
/*
* Set the user root from the user home and the user dir
* Set default locatiuons for user files if necessary.
*/
if (gnustepUserDir == nil)
{
ASSIGN(gnustepUserDir, @"GNUstep");
}
if (gnustepUserDefaultsDir == nil)
{
ASSIGN(gnustepUserDefaultsDir, @"GNUstep/Defaults");
}
/*
* Set the user root from the user home and the user dir
*/
ASSIGN(gnustepUserRoot,
[gnustepUserHome stringByAppendingPathComponent: gnustepUserDir]);
/* Finally we check and report problems... */
/*
* Finally set default locations for the essential paths.
*/
if (gnustepSystemRoot == nil)
{
gnustepSystemRoot = [NSString stringWithCString:\
STRINGIFY(GNUSTEP_INSTALL_PREFIX)];
fprintf (stderr, "Warning - GNUSTEP_SYSTEM_ROOT is not set " \
"- using %s\n", [gnustepSystemRoot lossyCString]);
}
if (gnustepNetworkRoot == nil)
{
gnustepNetworkRoot = [NSString stringWithCString:\
STRINGIFY(GNUSTEP_NETWORK_ROOT)];
fprintf (stderr, "Warning - GNUSTEP_NETWORK_ROOT is not set " \
"- using %s\n", [gnustepNetworkRoot lossyCString]);
}
if (gnustepLocalRoot == nil)
{
gnustepLocalRoot = [NSString stringWithCString:\
STRINGIFY(GNUSTEP_LOCAL_ROOT)];
fprintf (stderr, "Warning - GNUSTEP_LOCAL_ROOT is not set " \
"- using %s\n", [gnustepLocalRoot lossyCString]);
}
}