--- gforth/libcc.fs	2010/12/31 18:09:02	1.67
+++ gforth/libcc.fs	2012/07/23 22:12:35	1.74
@@ -1,6 +1,6 @@
 \ libcc.fs	foreign function interface implemented using a C compiler
 
-\ Copyright (C) 2006,2007,2008,2009,2010 Free Software Foundation, Inc.
+\ Copyright (C) 2006,2007,2008,2009,2010,2011 Free Software Foundation, Inc.
 
 \ This file is part of Gforth.
 
@@ -64,8 +64,8 @@
 \ wrapper again.  This is all done by loading the index file(s?),
 \ which define words for the wrappers in a separate wordlist.
 
-\ The files are built in .../lib/gforth/$VERSION/libcc/ or
-\ ~/.gforth/libcc/$HOST/.
+\ The files are built in .../lib/gforth$ARCH/$VERSION/libcc/ or
+\ ~/.gforth$ARCH/libcc/$HOST/.
 
 \ Todo: conversion between function pointers and xts (both directions)
 
@@ -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/" 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)
@@ -466,7 +468,9 @@ create gen-wrapped-types
     \ addr points to the return type index of a c-function descriptor
     dup { descriptor }
     count { ret } count 2dup { d: pars } chars + count { d: c-name }
-    ." void " lib-modulename 2@ type ." _LTX_" descriptor wrapper-function-name 2dup type drop free throw
+    ." void "
+    [ 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  "
     pars c-name 2over count-stacks ret gen-wrapped-stmt .\" ;\n"
@@ -504,13 +508,14 @@ create gen-wrapped-types
     libcc-named-dir-v 2@ ;
 
 : libcc-tmp-dir ( -- c-addr u )
-    s" ~/.gforth/libcc-tmp/" ;
+    s" ~/.gforth" arch-modifier s+ s" /libcc-tmp/" s+ ;
 
 : 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+
+    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
@@ -605,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"
@@ -659,7 +665,7 @@ DEFER compile-wrapper-function ( -- )
     \G specified stack effect and calls the C function @code{c-name}.
     ['] parse-function-types (c-function) ;
 
-: c-value ( "forth-name" "c-name" "[---]" "type" -- ) \ gforth
+: c-value ( "forth-name" "c-name" "---" "type" -- ) \ gforth
     \G Define a Forth word @i{forth-name}.  @i{Forth-name} has the
     \G specified stack effect and gives the C value of @code{c-name}.
     ['] parse-value-type (c-function) ;
@@ -697,7 +703,7 @@ clear-libs
     compile-wrapper-function1 ;
 
 : init-libcc ( -- )
-    s" ~/.gforth/libcc-named/" libcc-named-dir-v 2!
+    s" ~/.gforth" arch-modifier s+ s" /libcc-named/" s+ libcc-named-dir-v 2!
 [IFDEF] $init
     libcc-path $init
     libcc-named-dir libcc-path also-path