--- fbc_linux.bas.orig	2006-04-21 00:25:18.000000000 +0300
+++ fbc_linux.bas	2006-04-21 02:32:37.000000000 +0300
@@ -107,7 +107,7 @@
     end if
 
 	'' set script file
-	ldcline += " -T \"" + bindir + "elf_i386.x\""
+	ldcline += " -T \"@GENTOO_FREEBASIC@/elf_i386.x\""
 
     if( len( fbc.mapfile ) > 0) then
         ldcline += " -Map " + fbc.mapfile
@@ -138,7 +138,7 @@
 	ldcline += " -L \"" + libdir + QUOTE
 
     '' and the current path to libs search list
-    ldcline += " -L \"./\""
+    ldcline += " -L \"./\" -L \"@GENTOO_GCC_LIB_PATH@\""
 
     '' add additional user-specified library search paths
     for i = 0 to fbc.pths-1
@@ -150,7 +150,7 @@
 		ldcline += " \"" + libdir + "/crt1.o\""
 	end if
 	ldcline += " \"" + libdir + "/crti.o\""
-	ldcline += " \"" + libdir + "/crtbegin.o\""
+	ldcline += " \"@GENTOO_GCC_LIB_PATH@/crtbegin.o\""
 
     '' init lib group
     ldcline += " -( "
@@ -166,7 +166,7 @@
     ldcline += "-) "
 
 	'' crt end stuff
-	ldcline += " \"" + libdir + "/crtend.o\""
+	ldcline += " \"@GENTOO_GCC_LIB_PATH@/crtend.o\""
 	ldcline += " \"" + libdir + "/crtn.o\""
 
     '' invoke ld
--- fb.bas.orig	2006-04-20 22:19:43.000000000 +0300
+++ fb.bas	2006-04-20 22:20:38.000000000 +0300
@@ -391,9 +391,9 @@
 		pathTB(FB_PATH_LIB)	= "\\lib\\dos"
 
 	case FB_COMPTARGET_LINUX
-		pathTB(FB_PATH_BIN) = "\\bin\\linux\\"
+		pathTB(FB_PATH_BIN) = "\\usr\\bin\\"
 		pathTB(FB_PATH_INC) = "\\inc\\"
-		pathTB(FB_PATH_LIB) = "\\lib\\linux"
+		pathTB(FB_PATH_LIB) = "\\usr\\lib"
 
 	case FB_COMPTARGET_XBOX
 		pathTB(FB_PATH_BIN) = "\\bin\\win32\\"