gnustep/apps-projectcenter
0
0
Fork 0
mirror of https://github.com/gnustep/apps-projectcenter.git synced 2025-03-17 16:12:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed a bug in the lib makefile creation part.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/apps/projectcenter/trunk@13750 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Philippe C.D. Robert 2002-06-01 13:46:29 +00:00
parent 8f06001865
commit e6ce7b3293
4 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
PCLib/GNUmakefile
View file

@ -29,7 +29,6 @@ libProjectCenter_HEADER_FILES_DIR=.
libProjectCenter_HEADER_FILES_INSTALL_DIR=/ProjectCenter
ADDITIONAL_INCLUDE_DIRS = -I..
srcdir = .
GNUSTEP_INSTALLATION_DIR=$(GNUSTEP_SYSTEM_ROOT)
PROJECTCENTER_INSTALLATION_DIR=$(GNUSTEP_INSTALLATION_DIR)
PROJECTCENTER_INSTALL_PREFIX=$(GNUSTEP_INSTALLATION_DIR)

6
PCLib/PCBundleLoader.m
View file

@ -107,7 +107,7 @@
if (!path || [path isEqualToString:@""])
{
NSDictionary *env = [[NSProcessInfo processInfo] environment];
NSString *prefix = [env objectForKey:@"GNUSTEP_SYSTEM_ROOT"];
NSString *prefix = [env objectForKey:@"GNUSTEP_INSTALLATION_DIR"];
if (prefix && ![prefix isEqualToString:@""])
{
@ -115,7 +115,7 @@
}
else
{
path = [NSString stringWithString:@"/usr/GNUstep/System/Library/ProjectCenter"];
path = [NSString stringWithString:@"/usr/GNUstep/Local/Library/ProjectCenter"];
}
[[NSUserDefaults standardUserDefaults] setObject:path forKey:BundlePaths];
@ -135,6 +135,8 @@
}
#endif// DEBUG
NSLog([NSString stringWithFormat:@"Loading bundles at %@",path]);
dir = [[NSFileManager defaultManager] directoryContentsAtPath:path];
enumerator = [dir objectEnumerator];

2
PCLib/PCMakefileFactory.m
View file

@ -331,7 +331,7 @@ static PCMakefileFactory *_factory = nil;
- (void)appendLibraryInstallDir:(NSString*)dir
{
[self appendString:[NSString stringWithFormat:@"GNUSTEP_INSTALLATION_DIR=%@\n",dir]];
//[self appendString:[NSString stringWithFormat:@"GNUSTEP_INSTALLATION_DIR=%@\n",dir]];
[self appendString:[NSString stringWithFormat:@"%@_INSTALLATION_DIR=$(GNUSTEP_INSTALLATION_DIR)\n",[pnme uppercaseString]]];
[self appendString:[NSString stringWithFormat:@"%@_INSTALL_PREFIX=$(GNUSTEP_INSTALLATION_DIR)\n",[pnme uppercaseString]]];
}

2
PCLib/ProjectCenter.pcproj
View file

@ -60,7 +60,7 @@
PCHistoryController.h,
PCMakefileFactory.h
);
INSTALLDIR = "$(GNUSTEP_SYSTEM_ROOT)";
INSTALLDIR = "$(GNUSTEP_INSTALLATION_DIR)";
LANGUAGE = English;
LAST_EDITING = "";
LIBRARIES = (