Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

axeld + bonefish:

Browse Source 
Adjusted PATH, LIBRARY_PATH, and the paths built into the runtime loader
to included the /boot/common tree.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@23974 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold 2008-02-17 13:59:29 +00:00
parent 01335789e4
commit 2dd86b93a6
2 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
data/system/boot/SetupEnvironment
View File

@ -44,12 +44,12 @@ export BE_DEFAULT_CPLUS_FLAGS=""
if [ "$SAFEMODE" != "yes" ]
then
export PATH=.:$HOME/config/bin:/bin:/boot/apps:/boot/preferences:/boot/beos/apps:/boot/beos/preferences:$BETOOLS
export LIBRARY_PATH="%A/lib:$HOME/config/lib:/boot/beos/system/lib"
export PATH=.:$HOME/config/bin:/boot/common/bin:/bin:/boot/apps:/boot/preferences:/boot/beos/apps:/boot/beos/preferences:$BETOOLS
export LIBRARY_PATH="%A/lib:$HOME/config/lib:/boot/common/lib:/boot/beos/system/lib"
export ADDON_PATH="%A/add-ons:$HOME/config/add-ons:/boot/beos/system/add-ons"
else
export PATH=.:/bin:/boot/apps:/boot/preferences:/boot/beos/apps:/boot/beos/preferences:$BETOOLS
export LIBRARY_PATH="%A/lib:/boot/beos/system/lib"
export PATH=.:/boot/common/bin:/bin:/boot/apps:/boot/preferences:/boot/beos/apps:/boot/beos/preferences:$BETOOLS
export LIBRARY_PATH="%A/lib:/boot/common/lib:/boot/beos/system/lib"
export ADDON_PATH="%A/add-ons:/boot/beos/system/add-ons"
fi

16
src/system/runtime_loader/runtime_loader.c
View File

@ -59,18 +59,20 @@ search_path_for_type(image_type type)
switch (type) {
case B_APP_IMAGE:
return "/bin:"
"/boot/apps:"
"/boot/preferences:"
"/boot/beos/apps:"
"/boot/beos/preferences:"
"/boot/develop/tools/gnupro/bin";
return "/boot/common/bin"
":/bin"
":/boot/apps"
":/boot/preferences"
":/boot/beos/apps"
":/boot/beos/preferences"
":/boot/develop/tools/gnupro/bin";
case B_LIBRARY_IMAGE:
return "%A/lib:/boot/beos/system/lib";
return "%A/lib:/boot/common/lib:/boot/beos/system/lib";
case B_ADD_ON_IMAGE:
return "%A/add-ons"
":/boot/common/add-ons"
":/boot/beos/system/add-ons";
default: