Index: src/libcfa/Makefile.am
===================================================================
--- src/libcfa/Makefile.am	(revision c443d1d3435a17963bd6f81fa826d1d31a83512a)
+++ src/libcfa/Makefile.am	(revision 2988eebb61a23bfe28efea59b2bdd2e4fb6028c1)
@@ -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
@@ -75,5 +75,5 @@
 stdhdr = ${shell echo stdhdr/*}
 
-cfa_includedir = $(includedir)/cfa
+cfa_includedir = $(CFA_INCDIR)
 nobase_cfa_include_HEADERS = ${headers} ${stdhdr} concurrency/invoke.h
 
@@ -81,3 +81,3 @@
 
 maintainer-clean-local:
-	-rm -rf ${includedir}/*
+	-rm -rf ${includedir}/* ${libdir}/*
Index: src/libcfa/Makefile.in
===================================================================
--- src/libcfa/Makefile.in	(revision c443d1d3435a17963bd6f81fa826d1d31a83512a)
+++ src/libcfa/Makefile.in	(revision 2988eebb61a23bfe28efea59b2bdd2e4fb6028c1)
@@ -201,4 +201,5 @@
 CFA_INCDIR = @CFA_INCDIR@
 CFA_LIBDIR = @CFA_LIBDIR@
+CFA_NAME = @CFA_NAME@
 CFA_PREFIX = @CFA_PREFIX@
 CFLAGS = -quiet -no-include-stdhdr -XCFA -t -B${abs_top_srcdir}/src/driver ${EXTRA_FLAGS}
@@ -281,5 +282,5 @@
 infodir = @infodir@
 install_sh = @install_sh@
-libdir = @libdir@
+libdir = ${CFA_LIBDIR}
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -315,5 +316,5 @@
 libcfa_d_a_CFLAGS = -debug -O0
 stdhdr = ${shell echo stdhdr/*}
-cfa_includedir = $(includedir)/cfa
+cfa_includedir = $(CFA_INCDIR)
 nobase_cfa_include_HEADERS = ${headers} ${stdhdr} concurrency/invoke.h
 CLEANFILES = libcfa-prelude.c
@@ -1160,5 +1161,5 @@
 
 maintainer-clean-local:
-	-rm -rf ${includedir}/*
+	-rm -rf ${includedir}/* ${libdir}/*
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
Index: src/libcfa/iostream
===================================================================
--- src/libcfa/iostream	(revision c443d1d3435a17963bd6f81fa826d1d31a83512a)
+++ src/libcfa/iostream	(revision 2988eebb61a23bfe28efea59b2bdd2e4fb6028c1)
@@ -10,6 +10,6 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Mar  6 17:48:01 2017
-// Update Count     : 97
+// Last Modified On : Mon Mar  6 20:51:35 2017
+// Update Count     : 98
 //
 
Index: src/libcfa/iostream.c
===================================================================
--- src/libcfa/iostream.c	(revision c443d1d3435a17963bd6f81fa826d1d31a83512a)
+++ src/libcfa/iostream.c	(revision 2988eebb61a23bfe28efea59b2bdd2e4fb6028c1)
@@ -10,6 +10,6 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Mar  6 17:48:05 2017
-// Update Count     : 312
+// Last Modified On : Mon Mar  6 20:52:02 2017
+// Update Count     : 313
 //
 
Index: src/libcfa/stdlib
===================================================================
--- src/libcfa/stdlib	(revision c443d1d3435a17963bd6f81fa826d1d31a83512a)
+++ src/libcfa/stdlib	(revision 2988eebb61a23bfe28efea59b2bdd2e4fb6028c1)
@@ -10,6 +10,6 @@
 // Created On       : Thu Jan 28 17:12:35 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Feb 24 21:07:16 2017
-// Update Count     : 101
+// Last Modified On : Sat Mar  4 22:03:54 2017
+// Update Count     : 102
 //
 
Index: src/libcfa/stdlib.c
===================================================================
--- src/libcfa/stdlib.c	(revision c443d1d3435a17963bd6f81fa826d1d31a83512a)
+++ src/libcfa/stdlib.c	(revision 2988eebb61a23bfe28efea59b2bdd2e4fb6028c1)
@@ -10,6 +10,6 @@
 // Created On       : Thu Jan 28 17:10:29 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Feb 24 21:08:11 2017
-// Update Count     : 171
+// Last Modified On : Sat Mar  4 22:02:22 2017
+// Update Count     : 172
 //