diff --git a/ChangeLog b/ChangeLog index 30695bd..fa73b21 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2012-11-22 German Arias + + * Modules/Projects/Library/PCLibProject.m: Don't add the prefix "lib" + to LIBRARY_NAME, gnustep-make will add this prefix anyway. On the other + hand, the super class isn't able to add this prefix to + XXX_RESOURCE_FILES at GNUmakefile. + 2012-08-30 Riccardo Mottola * Modules/Debuggers/ProjectCenter/PTYView.m diff --git a/Modules/Projects/Library/PCLibProject.m b/Modules/Projects/Library/PCLibProject.m index 4dba8f3..98a2447 100644 --- a/Modules/Projects/Library/PCLibProject.m +++ b/Modules/Projects/Library/PCLibProject.m @@ -258,9 +258,9 @@ // Sources [self appendPublicHeaders:mf]; [mf appendClasses:[projectDict objectForKey:PCClasses] - forTarget:[NSString stringWithFormat:@"lib%@",projectName]]; + forTarget:[NSString stringWithFormat:@"%@",projectName]]; [mf appendOtherSources:[projectDict objectForKey:PCOtherSources] - forTarget:[NSString stringWithFormat:@"lib%@",projectName]]; + forTarget:[NSString stringWithFormat:@"%@",projectName]]; // Tail [self appendTail:mf]; @@ -287,12 +287,12 @@ projectName]]; [mff appendString:[NSString stringWithFormat:@"LIBRARY_VAR = %@\n", [projectName uppercaseString]]]; - [mff appendString:[NSString stringWithFormat:@"LIBRARY_NAME = lib%@\n", + [mff appendString:[NSString stringWithFormat:@"LIBRARY_NAME = %@\n", projectName]]; - [mff appendString:[NSString stringWithFormat:@"lib%@_HEADER_FILES_DIR = %@\n", + [mff appendString:[NSString stringWithFormat:@"%@_HEADER_FILES_DIR = %@\n", projectName,@"."]]; [mff appendString:[NSString stringWithFormat: - @"lib%@_HEADER_FILES_INSTALL_DIR = /%@\n", projectName, projectName]]; + @"%@_HEADER_FILES_INSTALL_DIR = /%@\n", projectName, projectName]]; } - (void)appendPublicHeaders:(PCMakefileFactory *)mff