--- gforth/libcc.fs	2012/07/02 21:59:10	1.71
+++ gforth/libcc.fs	2012/07/23 12:49:06	1.72
@@ -467,7 +467,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" 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 +512,7 @@ create gen-wrapped-types
     2over s+ 2swap drop free throw ;
 
 : open-wrappers ( -- addr|0 )
-    lib-filename 2@ lib-suffix s+
+    lib-filename 2@ dirname s" lib" s+ lib-filename 2@ basename s+ lib-suffix 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
@@ -607,7 +607,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 s" lib" 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"