gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-04-22 16:33:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

Allow bare "." as path name, but fix template to use "./"

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@34012 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 2011-10-17 09:10:18 +00:00
parent e6a75007c0
commit 765e64da85
2 changed files with 28 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Source/NSPathUtilities.m
View file

@ -239,8 +239,8 @@ static void ShutdownPathUtilities(void);
})
/* Grab a path from the config file, making it relative to the config
* file location if it begins with './' or '../', and checking that the
* result is an absolute path.
* file location if it is '.' or begins with './' or '../', and checking
* that the result is an absolute path.
*/
#define ASSIGN_PATH(var, dictionary, key) ({\
id val = getPathConfig(dictionary, key);\
@ -361,7 +361,11 @@ substUser(NSString *str)
static inline NSString *
getPath(NSString *path)
{
if ([path hasPrefix: @"./"] == YES)
if ([path isEqualToString: @"."] == YES)
{
path = gnustepConfigPath;
}
else if ([path hasPrefix: @"./"] == YES)
{
path = [gnustepConfigPath stringByAppendingPathComponent:
[path substringFromIndex: 2]];

42
standalone.conf
View file

@ -31,38 +31,38 @@ GNUSTEP_LOCAL_USERS_DIR=/home
# paths.
GNUSTEP_MAKEFILES=./Makefiles
GNUSTEP_SYSTEM_APPS=.
GNUSTEP_SYSTEM_ADMIN_APPS=.
GNUSTEP_SYSTEM_WEB_APPS=.
GNUSTEP_SYSTEM_TOOLS=.
GNUSTEP_SYSTEM_ADMIN_TOOLS=.
GNUSTEP_SYSTEM_LIBRARY=.
GNUSTEP_SYSTEM_APPS=./
GNUSTEP_SYSTEM_ADMIN_APPS=./
GNUSTEP_SYSTEM_WEB_APPS=./
GNUSTEP_SYSTEM_TOOLS=./
GNUSTEP_SYSTEM_ADMIN_TOOLS=./
GNUSTEP_SYSTEM_LIBRARY=./
GNUSTEP_SYSTEM_HEADERS=./include
GNUSTEP_SYSTEM_LIBRARIES=.
GNUSTEP_SYSTEM_LIBRARIES=./
GNUSTEP_SYSTEM_DOC=./Documentation
GNUSTEP_SYSTEM_DOC_MAN=./man
GNUSTEP_SYSTEM_DOC_INFO=./info
GNUSTEP_NETWORK_APPS=.
GNUSTEP_NETWORK_ADMIN_APPS=.
GNUSTEP_NETWORK_WEB_APPS=.
GNUSTEP_NETWORK_TOOLS=.
GNUSTEP_NETWORK_ADMIN_TOOLS=.
GNUSTEP_NETWORK_LIBRARY=.
GNUSTEP_NETWORK_APPS=./
GNUSTEP_NETWORK_ADMIN_APPS=./
GNUSTEP_NETWORK_WEB_APPS=./
GNUSTEP_NETWORK_TOOLS=./
GNUSTEP_NETWORK_ADMIN_TOOLS=./
GNUSTEP_NETWORK_LIBRARY=./
GNUSTEP_NETWORK_HEADERS=./include
GNUSTEP_NETWORK_LIBRARIES=.
GNUSTEP_NETWORK_LIBRARIES=./
GNUSTEP_NETWORK_DOC=./Documentation
GNUSTEP_NETWORK_DOC_MAN=./man
GNUSTEP_NETWORK_DOC_INFO=./info
GNUSTEP_LOCAL_APPS=.
GNUSTEP_LOCAL_ADMIN_APPS=.
GNUSTEP_LOCAL_WEB_APPS=.
GNUSTEP_LOCAL_TOOLS=.
GNUSTEP_LOCAL_ADMIN_TOOLS=.
GNUSTEP_LOCAL_LIBRARY=.
GNUSTEP_LOCAL_APPS=./
GNUSTEP_LOCAL_ADMIN_APPS=./
GNUSTEP_LOCAL_WEB_APPS=./
GNUSTEP_LOCAL_TOOLS=./
GNUSTEP_LOCAL_ADMIN_TOOLS=./
GNUSTEP_LOCAL_LIBRARY=./
GNUSTEP_LOCAL_HEADERS=./include
GNUSTEP_LOCAL_LIBRARIES=.
GNUSTEP_LOCAL_LIBRARIES=./
GNUSTEP_LOCAL_DOC=./Documentation
GNUSTEP_LOCAL_DOC_MAN=./man
GNUSTEP_LOCAL_DOC_INFO=./info