diff --git a/PCLib/GNUmakefile b/PCLib/GNUmakefile index 53c532d..c2379b8 100644 --- a/PCLib/GNUmakefile +++ b/PCLib/GNUmakefile @@ -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) diff --git a/PCLib/PCBundleLoader.m b/PCLib/PCBundleLoader.m index 07a1c82..fe15c83 100644 --- a/PCLib/PCBundleLoader.m +++ b/PCLib/PCBundleLoader.m @@ -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]; diff --git a/PCLib/PCMakefileFactory.m b/PCLib/PCMakefileFactory.m index 9481b9d..c0bf049 100644 --- a/PCLib/PCMakefileFactory.m +++ b/PCLib/PCMakefileFactory.m @@ -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]]]; } diff --git a/PCLib/ProjectCenter.pcproj b/PCLib/ProjectCenter.pcproj index b77002c..4d0768a 100644 --- a/PCLib/ProjectCenter.pcproj +++ b/PCLib/ProjectCenter.pcproj @@ -60,7 +60,7 @@ PCHistoryController.h, PCMakefileFactory.h ); - INSTALLDIR = "$(GNUSTEP_SYSTEM_ROOT)"; + INSTALLDIR = "$(GNUSTEP_INSTALLATION_DIR)"; LANGUAGE = English; LAST_EDITING = ""; LIBRARIES = (