Author: gcasa
Date: Wed Apr 27 01:46:31 2016
New Revision: 39696
URL: http://svn.gna.org/viewcvs/gnustep?rev=39696&view=rev
Log:
Changes to fix issue with build after RFM's change.
Modified:
libs/xcode/trunk/ChangeLog
libs/xcode/trunk/PBXFrameworksBuildPhase.m
Modified: libs/xcode/trunk/ChangeLog
URL:
http://svn.gna.org/viewcvs/gnustep/libs/xcode/trunk/ChangeLog?rev=39696&r1=39695&r2=39696&view=diff
==============================================================================
--- libs/xcode/trunk/ChangeLog (original)
+++ libs/xcode/trunk/ChangeLog Wed Apr 27 01:46:31 2016
@@ -1,3 +1,10 @@
+2016-04-26 19:45-EDT Gregory John Casamento <[email protected]>
+
+ * PBXFrameworksBuildPhase.m: Use gnustep-config to get the
+ paths for GNUSTEP_SYSTEM_LIBRARY, GNUSTEP_LOCAL_LIBRARY and
+ GNUSTEP_USER_LIBRARY after RFM's change to gnustep-make.
+ This change makes the build method a little more consistent.
+
2014-08-03 03:49-EDT Gregory John Casamento <[email protected]>
* Updated README and Tools/pcpg/README.
Modified: libs/xcode/trunk/PBXFrameworksBuildPhase.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/xcode/trunk/PBXFrameworksBuildPhase.m?rev=39696&r1=39695&r2=39696&view=diff
==============================================================================
--- libs/xcode/trunk/PBXFrameworksBuildPhase.m (original)
+++ libs/xcode/trunk/PBXFrameworksBuildPhase.m Wed Apr 27 01:46:31 2016
@@ -145,15 +145,12 @@
- (NSString *) linkString
{
- NSString *systemLibDir = [[[NSString stringWithCString:
getenv("GNUSTEP_SYSTEM_ROOT")]
- stringByAppendingPathComponent:
@"Library"]
- stringByAppendingPathComponent:
@"Libraries"];
- NSString *localLibDir = [[[NSString stringWithCString:
getenv("GNUSTEP_LOCAL_ROOT")]
- stringByAppendingPathComponent:
@"Library"]
- stringByAppendingPathComponent:
@"Libraries"];
- NSString *userLibDir = [[[NSString stringWithCString:
getenv("GNUSTEP_USER_ROOT")]
- stringByAppendingPathComponent: @"Library"]
- stringByAppendingPathComponent:
@"Libraries"];
+ NSString *systemLibDir = [@"`gnustep-config
--variable=GNUSTEP_SYSTEM_LIBRARY`/"
+ stringByAppendingPathComponent: @"Libraries"];
+ NSString *localLibDir = [@"`gnustep-config
--variable=GNUSTEP_LOCAL_LIBRARY`/"
+ stringByAppendingPathComponent: @"Libraries"];
+ NSString *userLibDir = [@"`gnustep-config --variable=GNUSTEP_USER_LIBRARY`/"
+ stringByAppendingPathComponent: @"Libraries"];
NSString *buildDir = [NSString stringWithCString:
getenv("TARGET_BUILD_DIR")];
NSString *uninstalledProductsDir = [buildDir stringByAppendingPathComponent:
@"UninstalledProducts"];
NSEnumerator *en = [files objectEnumerator];
_______________________________________________
Gnustep-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/gnustep-cvs
