--- gforth/libcc.fs	2008/07/05 20:09:42	1.39
+++ gforth/libcc.fs	2008/07/13 22:52:00	1.45
@@ -158,6 +158,8 @@ variable lib-handle-addr \ points to the
   here 0 , lib-handle-addr ! \ just make sure LIB-HANDLE always works
 2variable lib-filename   \ filename without extension
 2variable lib-modulename \ basename of the file without extension
+2variable libcc-named-dir-v \ directory for named libcc wrapper libraries
+0 value libcc-path       \ pointer to path of library directories
 
 : delete-file 2drop 0 ;
 
@@ -441,30 +443,55 @@ create gen-wrapped-types
     endif
     .\" }\n" ;
 
-: open-wrappers ( -- addr )
-    lib-filename 2@ s" .la" s+
-    2dup open-lib >r
-    drop free throw r> ;
-
-: tempdir ( -- c-addr u )
-    s" TMPDIR" getenv dup 0= if
-        2drop s" /tmp"
-    then ;
+: scan-back { c-addr u1 c -- c-addr u2 }
+    \ the last occurence of c in c-addr u1 is at u2-1; if it does not
+    \ occur, u2=0.
+    c-addr 1- c-addr u1 + 1- u-do
+	i c@ c = if
+	    c-addr i over - 1+ unloop exit endif
+    1 -loop
+    c-addr 0 ;
+
+: dirname ( c-addr1 u1 -- c-addr2 u2 )
+    \ directory name of the file name c-addr1 u1, including the final "/".
+    '/ scan-back ;
+
+: basename ( c-addr1 u1 -- c-addr2 u2 )
+    \ file name without directory component
+    2dup dirname nip /string ;
 
 : gen-filename ( x -- c-addr u )
     \ generates a file basename for lib-handle-addr X
     0 <<# ['] #s $10 base-execute #> 
     s" gforth_c_" 2swap s+ #>> ;
 
-: prepend-dirname ( c-addr1 u1 -- c-addr2 u2 )
-    tempdir s" /" s+ 2over append
-    2swap drop free throw ;
+: libcc-named-dir ( -- c-addr u )
+    libcc-named-dir-v 2@ ;
+
+: libcc-tmp-dir ( -- c-addr u )
+    s" ~/.gforth/libcc-tmp/" ;
+
+: prepend-dirname ( c-addr1 u1 c-addr2 u2 -- c-addr3 u3 )
+    2over s+ 2swap drop free throw ;
+
+: open-wrappers ( -- addr|0 )
+    lib-filename 2@ s" .la" s+
+    2dup libcc-named-dir string-prefix? if ( c-addr u )
+	\ see if we can open it in the path
+	libcc-named-dir nip /string
+	libcc-path open-path-file if
+	    0 exit endif
+	( wfile-id c-addr2 u2 ) rot close-file throw save-mem ( c-addr2 u2 )
+    endif
+    \ 2dup cr type
+    2dup open-lib >r
+    drop free throw r> ;
 
 : c-library-name-setup ( c-addr u -- )
     assert( c-source-file-id @ 0= )
-    prepend-dirname { d: filename }
+    { d: filename }
     here 0 , lib-handle-addr ! filename lib-filename 2!
-    filename tempdir nip 1+ /string lib-modulename 2! ;
+    filename basename lib-modulename 2! ;
    
 : c-library-name-create ( -- )
     lib-filename 2@ s" .c" s+ 2dup w/o create-file throw
@@ -472,20 +499,20 @@ create gen-wrapped-types
     ['] print-c-prefix-lines swap outfile-execute
     drop free throw ;
 
-: c-library-name1 ( c-addr u -- )
+: c-named-library-name ( c-addr u -- )
     \ set up filenames for a (possibly new) library; c-addr u is the
     \ basename of the library
-    c-library-name-setup
+    libcc-named-dir prepend-dirname c-library-name-setup
     open-wrappers dup if
 	lib-handle-addr @ !
     else
 	drop c-library-name-create
     endif ;
 
-: c-library-name2 ( c-addr u -- )
+: c-tmp-library-name ( c-addr u -- )
     \ set up filenames for a new library; c-addr u is the basename of
     \ the library
-    c-library-name-setup c-library-name-create ;
+    libcc-tmp-dir prepend-dirname c-library-name-setup c-library-name-create ;
 
 : lib-handle ( -- addr )
     lib-handle-addr @ @ ;
@@ -493,7 +520,7 @@ create gen-wrapped-types
 : init-c-source-file ( -- )
     lib-handle 0= if
 	c-source-file-id @ 0= if
-	    here gen-filename c-library-name2
+	    here gen-filename c-tmp-library-name
 	endif
     endif ;
 
@@ -534,7 +561,7 @@ DEFER compile-wrapper-function ( -- )
 	\    cr 2dup type
 	2dup system drop free throw $? abort" libtool compile failed"
 	[ libtool-command s"  --silent --mode=link gcc -module -rpath " s+ ] sliteral
-	tempdir s+ s"  " append
+	lib-filename 2@ dirname s+ s"  " append
 	lib-filename 2@ append s" .lo -o " append
 	lib-filename 2@ append s" .la" append ( c-addr u )
 	c-libs @ ['] append-l list-map
@@ -601,7 +628,7 @@ clear-libs
 \G Start a C library interface with name @i{c-addr u}.
     clear-libs
     ['] c-library-incomplete is compile-wrapper-function
-    c-library-name1 ;
+    c-named-library-name ;
 
 : c-library ( "name" -- ) \ gforth
 \G Parsing version of @code{c-library-name}
@@ -611,3 +638,19 @@ clear-libs
 \G Finish and (if necessary) build the latest C library interface.
     ['] compile-wrapper-function1 is compile-wrapper-function
     compile-wrapper-function1 ;
+
+: init-libcc ( -- )
+    s" ~/.gforth/libcc-named/" libcc-named-dir-v 2!
+[IFDEF] make-path
+    make-path to libcc-path
+    libcc-named-dir libcc-path also-path
+    [ s" libccdir" getenv ] sliteral libcc-path also-path
+[THEN]
+;
+
+init-libcc
+
+:noname ( -- )
+    defers 'cold
+    init-libcc ;
+is 'cold