diff --git a/ChangeLog b/ChangeLog index 7f2f2b3..ae5d4e7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,10 +1,9 @@ 2009-09-17 Nicola Pero * Framework/PCMakefileFactory.m ([-createMakefileForProject:]): If - GNUSTEP_INSTALLATION_DOMAIN is not set, output a commented out - GNUSTEP_INSTALLATION_DOMAIN line so that the default is used but - people will still find out that the option exists if they look at - the file. + GNUSTEP_INSTALLATION_DOMAIN is not set, do not output it. This is + what was already happening, but the code seemed to assume + otherwise. 2009-09-17 Nicola Pero diff --git a/Framework/PCMakefileFactory.m b/Framework/PCMakefileFactory.m index 544746c..6a9719a 100644 --- a/Framework/PCMakefileFactory.m +++ b/Framework/PCMakefileFactory.m @@ -99,19 +99,11 @@ static PCMakefileFactory *_factory = nil; [NSString stringWithFormat: @"\nGNUSTEP_INSTALLATION_DOMAIN = %@\n", instDir]]; } - else if ([instDir isEqualToString: @""]) - { - /* This should not be specified; gnustep-make will use the - * default - normally, but not necessarily, LOCAL. - * We output a commented line here so that people looking - * at the file will know that this option exists, and - * if they want to change it, will search for it in - * ProjectCenter. - */ - [mfile appendString: - [NSString stringWithFormat: @"\n# GNUSTEP_INSTALLATION_DOMAIN = LOCAL\n", - instDir]]; - } + + /* If GNUSTEP_INSTALLATION_DOMAIN was not set explicitly by the + * user, it shoudl not be specified; gnustep-make will use the + * default - normally, but not necessarily, LOCAL. + */ [mfile appendString: @"\ninclude $(GNUSTEP_MAKEFILES)/common.make\n"];