Index: configure
===================================================================
--- configure	(revision 871b664007b379ce205a1c98c3284d7973afcedd)
+++ configure	(revision 088a5cdd8d3a236c5d44413bd779381bb291fc44)
@@ -3264,5 +3264,5 @@
 
 if test "$libdir" = '${exec_prefix}/lib'; then
- 	cfa_libdir=${cfa_prefix}/lib
+ 	cfa_libdir="${cfa_prefix}/lib/cfa"
 else
  	cfa_libdir=${libdir}
Index: configure.ac
===================================================================
--- configure.ac	(revision 871b664007b379ce205a1c98c3284d7973afcedd)
+++ configure.ac	(revision 088a5cdd8d3a236c5d44413bd779381bb291fc44)
@@ -145,5 +145,5 @@
 
 if test "$libdir" = '${exec_prefix}/lib'; then
- 	cfa_libdir=${cfa_prefix}/lib
+ 	cfa_libdir="${cfa_prefix}/lib/cfa"
 else
  	cfa_libdir=${libdir}
Index: src/Makefile.am
===================================================================
--- src/Makefile.am	(revision 871b664007b379ce205a1c98c3284d7973afcedd)
+++ src/Makefile.am	(revision 088a5cdd8d3a236c5d44413bd779381bb291fc44)
@@ -38,5 +38,5 @@
 
 # put into lib for now
-cfa_cpplibdir = ${libdir}
+cfa_cpplibdir = ${CFA_LIBDIR}
 cfa_cpplib_PROGRAMS = driver/cfa-cpp
 driver_cfa_cpp_SOURCES = ${SRC}
Index: src/Makefile.in
===================================================================
--- src/Makefile.in	(revision 871b664007b379ce205a1c98c3284d7973afcedd)
+++ src/Makefile.in	(revision 088a5cdd8d3a236c5d44413bd779381bb291fc44)
@@ -436,5 +436,5 @@
 
 # put into lib for now
-cfa_cpplibdir = ${libdir}
+cfa_cpplibdir = ${CFA_LIBDIR}
 driver_cfa_cpp_SOURCES = ${SRC}
 driver_cfa_cpp_LDADD = ${LEXLIB} -ldl			# yywrap
Index: src/driver/Makefile.am
===================================================================
--- src/driver/Makefile.am	(revision 871b664007b379ce205a1c98c3284d7973afcedd)
+++ src/driver/Makefile.am	(revision 088a5cdd8d3a236c5d44413bd779381bb291fc44)
@@ -32,5 +32,5 @@
 
 # put into lib for now
-cc1libdir = ${libdir}
+cc1libdir = ${CFA_LIBDIR}
 cc1lib_PROGRAMS = cc1
 cc1_SOURCES = cc1.cc
Index: src/driver/Makefile.in
===================================================================
--- src/driver/Makefile.in	(revision 871b664007b379ce205a1c98c3284d7973afcedd)
+++ src/driver/Makefile.in	(revision 088a5cdd8d3a236c5d44413bd779381bb291fc44)
@@ -212,5 +212,5 @@
 
 # put into lib for now
-cc1libdir = ${libdir}
+cc1libdir = ${CFA_LIBDIR}
 cc1_SOURCES = cc1.cc
 MAINTAINERCLEANFILES = @CFA_PREFIX@/bin/${bin_PROGRAMS} @CFA_PREFIX@/lib/${cc1lib_PROGRAMS}
Index: src/libcfa/Makefile.am
===================================================================
--- src/libcfa/Makefile.am	(revision 871b664007b379ce205a1c98c3284d7973afcedd)
+++ src/libcfa/Makefile.am	(revision 088a5cdd8d3a236c5d44413bd779381bb291fc44)
@@ -18,4 +18,5 @@
 AUTOMAKE_OPTIONS = subdir-objects
 
+libdir = ${CFA_LIBDIR}
 lib_LIBRARIES =
 
@@ -67,5 +68,4 @@
 ${libobjs} : ${abs_top_srcdir}/src/driver/cfa-cpp ${cfalib_DATA} # add dependency to cfa-cpp so all libraries are rebuilt with new translator
 
-
 libcfa_a_SOURCES = ${libsrc}
 libcfa_a_CFLAGS = -nodebug -O2
Index: src/libcfa/Makefile.in
===================================================================
--- src/libcfa/Makefile.in	(revision 871b664007b379ce205a1c98c3284d7973afcedd)
+++ src/libcfa/Makefile.in	(revision 088a5cdd8d3a236c5d44413bd779381bb291fc44)
@@ -281,5 +281,5 @@
 infodir = @infodir@
 install_sh = @install_sh@
-libdir = @libdir@
+libdir = ${CFA_LIBDIR}
 libexecdir = @libexecdir@
 localedir = @localedir@
Index: src/prelude/Makefile.am
===================================================================
--- src/prelude/Makefile.am	(revision 871b664007b379ce205a1c98c3284d7973afcedd)
+++ src/prelude/Makefile.am	(revision 088a5cdd8d3a236c5d44413bd779381bb291fc44)
@@ -19,5 +19,5 @@
 
 # put into lib for now
-cfalibdir = ${libdir}
+cfalibdir = ${CFA_LIBDIR}
 cfalib_DATA = builtins.cf extras.cf prelude.cf bootloader.c
 noinst_DATA = ../libcfa/libcfa-prelude.c
Index: src/prelude/Makefile.in
===================================================================
--- src/prelude/Makefile.in	(revision 871b664007b379ce205a1c98c3284d7973afcedd)
+++ src/prelude/Makefile.in	(revision 088a5cdd8d3a236c5d44413bd779381bb291fc44)
@@ -209,5 +209,5 @@
 
 # put into lib for now
-cfalibdir = ${libdir}
+cfalibdir = ${CFA_LIBDIR}
 cfalib_DATA = builtins.cf extras.cf prelude.cf bootloader.c
 noinst_DATA = ../libcfa/libcfa-prelude.c