Index: libcfa/configure
===================================================================
--- libcfa/configure	(revision 58b6d1b3b8da710a22441043f60cb988a2c2e56d)
+++ libcfa/configure	(revision a5121bff2d239413034fc4cc466f9e5b15eebd1b)
@@ -2584,5 +2584,9 @@
 
 	if test "$libdir" = '${exec_prefix}/lib'; then
-		cfa_libdir="${cfa_prefix}/lib/${cfa_name}/${ARCHITECTURE}${CONFIGURATION}"
+		if test "${ARCHITECTURE}" != ""; then
+			cfa_libdir="${cfa_prefix}/lib/${cfa_name}/${ARCHITECTURE}-${CONFIGURATION}/"
+		else
+			cfa_libdir="${cfa_prefix}/lib/${cfa_name}/"
+		fi
 	else
 		cfa_libdir="${libdir}/${ARCHITECTURE}${CONFIGURATION}"
Index: libcfa/src/Makefile.am
===================================================================
--- libcfa/src/Makefile.am	(revision 58b6d1b3b8da710a22441043f60cb988a2c2e56d)
+++ libcfa/src/Makefile.am	(revision a5121bff2d239413034fc4cc466f9e5b15eebd1b)
@@ -28,5 +28,5 @@
 # use -no-include-stdhdr to prevent rebuild cycles
 # The built sources must not depend on the installed headers
-AM_CFAFLAGS = -quiet -in-tree -B@DRIVER_DIR@ -XCFA --prelude-dir=$(top_builddir)/prelude -imacros prelude.c -I$(srcdir)/stdhdr
+AM_CFAFLAGS = -quiet -in-tree -imacros prelude.c -I$(srcdir)/stdhdr
 AM_CFLAGS = -g -Wall -Wno-unused-function @ARCH_FLAGS@
 AM_CCASFLAGS = -g -Wall -Wno-unused-function @ARCH_FLAGS@
Index: libcfa/src/Makefile.in
===================================================================
--- libcfa/src/Makefile.in	(revision 58b6d1b3b8da710a22441043f60cb988a2c2e56d)
+++ libcfa/src/Makefile.in	(revision a5121bff2d239413034fc4cc466f9e5b15eebd1b)
@@ -339,5 +339,5 @@
 # use -no-include-stdhdr to prevent rebuild cycles
 # The built sources must not depend on the installed headers
-AM_CFAFLAGS = -quiet -in-tree -B@DRIVER_DIR@ -XCFA --prelude-dir=$(top_builddir)/prelude -imacros prelude.c -I$(srcdir)/stdhdr
+AM_CFAFLAGS = -quiet -in-tree -imacros prelude.c -I$(srcdir)/stdhdr
 AM_CFLAGS = -g -Wall -Wno-unused-function @ARCH_FLAGS@
 AM_CCASFLAGS = -g -Wall -Wno-unused-function @ARCH_FLAGS@