gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-05-30 16:30:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

Changed to restructure subdirectory layout for binaries and system dependent

Browse source 
resources in a non-flattened installation.  First step towards seamless
Debian multiarch support.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@39918 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 2016-06-25 07:12:41 +00:00
parent 124afa845a
commit ecfbd24d8e
11 changed files with 168 additions and 85 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Source/NSTask.m
View file

@ -726,8 +726,7 @@ pty_slave(const char* name)
- (NSString*) validatedLaunchPath
{
NSString *libs;
NSString *cpu;
NSString *os;
NSString *target_dir;
NSString *prog;
NSString *lpath;
NSString *base_path;
@ -740,8 +739,7 @@ pty_slave(const char* name)
}
libs = [NSBundle _library_combo];
os = [NSBundle _gnustep_target_os];
cpu = [NSBundle _gnustep_target_cpu];
target_dir = [NSBundle _gnustep_target_dir];
/*
* Set lpath to the actual path to use for the executable.
@ -754,12 +752,14 @@ pty_slave(const char* name)
base_path = [_launchPath stringByDeletingLastPathComponent];
if ([[base_path lastPathComponent] isEqualToString: libs] == YES)
base_path = [base_path stringByDeletingLastPathComponent];
if ([[base_path lastPathComponent] isEqualToString: os] == YES)
base_path = [base_path stringByDeletingLastPathComponent];
if ([[base_path lastPathComponent] isEqualToString: cpu] == YES)
base_path = [base_path stringByDeletingLastPathComponent];
arch_path = [base_path stringByAppendingPathComponent: cpu];
arch_path = [arch_path stringByAppendingPathComponent: os];
if (nil == target_dir)
arch_path = base_path;
else
{
if ([[base_path lastPathComponent] isEqualToString: target_dir] == YES)
base_path = [base_path stringByDeletingLastPathComponent];
arch_path = [base_path stringByAppendingPathComponent: target_dir];
}
full_path = [arch_path stringByAppendingPathComponent: libs];
lpath = [full_path stringByAppendingPathComponent: prog];