--- gforth/libcc.fs	2012/07/02 21:59:10	1.71
+++ gforth/libcc.fs	2012/07/23 22:12:35	1.74
@@ -217,6 +217,8 @@ end-struct list%
 
 2variable c-libs \ library names in a string (without "lib")
 
+: lib-prefix ( -- addr u )  s" libgf" ;
+
 : add-lib ( c-addr u -- ) \ gforth
 \G Add library lib@i{string} to the list of libraries, where
     \G @i{string} is represented by @i{c-addr u}.
@@ -266,7 +268,7 @@ defer save-c-prefix-line ( c-addr u -- )
     \G One line of C declarations for the C interface
     -1 parse save-c-prefix-line ;
 
-s" #include <gforth" arch-modifier s+ s" /" s+ version-string s+ s" /libcc.h>" append ( c-addr u )
+s" #include <gforth" arch-modifier s+ s" /" append version-string append s" /libcc.h>" append ( c-addr u )
   2dup save-c-prefix-line drop free throw
 
 \ Types (for parsing)
@@ -467,7 +469,7 @@ create gen-wrapped-types
     dup { descriptor }
     count { ret } count 2dup { d: pars } chars + count { d: c-name }
     ." void "
-    [ lib-suffix s" .la" str= [IF] ] lib-modulename 2@ type ." _LTX_" [ [THEN] ]
+    [ lib-suffix s" .la" str= [IF] ] lib-prefix type lib-modulename 2@ type ." _LTX_" [ [THEN] ]
     descriptor wrapper-function-name 2dup type drop free throw
     .\" (GFORTH_ARGS)\n"
     .\" {\n  Cell MAYBE_UNUSED *sp = gforth_SP;\n  Float MAYBE_UNUSED *fp = gforth_FP;\n  "
@@ -512,7 +514,8 @@ create gen-wrapped-types
     2over s+ 2swap drop free throw ;
 
 : open-wrappers ( -- addr|0 )
-    lib-filename 2@ lib-suffix s+
+    lib-filename 2@ dirname lib-prefix s+
+    lib-filename 2@ basename append lib-suffix append
     2dup libcc-named-dir string-prefix? if ( c-addr u )
 	\ see if we can open it in the path
 	libcc-named-dir nip /string
@@ -607,7 +610,8 @@ DEFER compile-wrapper-function ( -- )
 	  libtool-cc append libtool-flags append s"  -module -rpath " s+ ] sliteral
 	lib-filename 2@ dirname replace-rpath s+ s"  " append
 	lib-filename 2@ append s" .lo -o " append
-	lib-filename 2@ append s" .la" append ( c-addr u )
+	lib-filename 2@ dirname append lib-prefix append
+	lib-filename 2@ basename append s" .la" append ( c-addr u )
 	c-libs 2@ append
 	\    2dup type cr
 	2dup system drop free throw $? abort" libtool link failed"