Index: FixDirReferences
===================================================================
--- FixDirReferences	(revision 3554)
+++ FixDirReferences	(working copy)
@@ -20,6 +20,25 @@
 Parse_Conf Compile/Compile.conf || exit 1
 Is_Writable "$PWD" || exit 1
 
+
+sed_changes="
+s%$goboPrograms/[^ /]*/*[^ /]*/+lib(/?)/*%$goboLibraries\1%g;
+s%$goboPrograms/[^ /]*/*[^ /]*/+lib([ '\''])%$goboLibraries/\1%g;
+s%$goboPrograms/[^ /]*/*[^ /]*/+include(/?)/*%$goboHeaders\1%g;
+s%$goboPrograms/[^ /]*/*[^ /]*/+include([ '\''])%$goboHeaders/\1%g;
+s%$goboPrograms/[^ /]*/*[^ /]*/+share(/?)/*%$goboShared\1%g;
+s%$goboPrograms/[^ /]*/*[^ /]*/+share([ '\''])%$goboShared/\1%g;
+s%$goboPrograms/[^ /]*/*[^ /]*/+etc(/?)/*%$goboSettings\1%g;
+s%$goboPrograms/[^ /]*/+Settings/(.*)%$goboSettings/\1%g;
+s%(-L|-I|-R)*$compileDir/[^('| )]*%%g;
+" 
+
+if [ $ROOTLESS_GOBOLINUX = 0 ]
+then
+   $sed_changes="$sed_changes%$goboPrograms/[^ /]*/*[^ /]*%/usr%g;
+"
+fi
+
 n=$(Number_Of_Arguments)
 for (( i=1 ; i<=n ; i++))
 do
@@ -34,18 +53,7 @@
    do old="$old~"
    done
    cp "${current}" "$old"
-   cat "$old" | sed -r "
-s%$goboPrograms/[^ /]*/*[^ /]*/+lib(/?)/*%$goboLibraries\1%g;
-s%$goboPrograms/[^ /]*/*[^ /]*/+lib([ '\''])%$goboLibraries/\1%g;
-s%$goboPrograms/[^ /]*/*[^ /]*/+include(/?)/*%$goboHeaders\1%g;
-s%$goboPrograms/[^ /]*/*[^ /]*/+include([ '\''])%$goboHeaders/\1%g;
-s%$goboPrograms/[^ /]*/*[^ /]*/+share(/?)/*%$goboShared\1%g;
-s%$goboPrograms/[^ /]*/*[^ /]*/+share([ '\''])%$goboShared/\1%g;
-s%$goboPrograms/[^ /]*/*[^ /]*/+etc(/?)/*%$goboSettings\1%g;
-s%$goboPrograms/[^ /]*/+Settings/(.*)%$goboSettings/\1%g;
-s%$goboPrograms/[^ /]*/*[^ /]*%/usr%g;
-s%(-L|-I|-R)*$compileDir/[^('| )]*%%g;
-" > "${current}"
+   cat "$old" | sed -r "$sed_changes" > "${current}"
    Boolean "backup" || rm -- "$old"
 done