Index: src/Makefile.in
===================================================================
--- src/Makefile.in	(revision e958ff8352d8c9f8add30af4b24004f996019960)
+++ src/Makefile.in	(revision df47e2fe44d197c175959e907b74622b64a8430e)
@@ -276,4 +276,5 @@
 CFA_INCDIR = @CFA_INCDIR@
 CFA_LIBDIR = @CFA_LIBDIR@
+CFA_NAME = @CFA_NAME@
 CFA_PREFIX = @CFA_PREFIX@
 CFLAGS = @CFLAGS@
Index: src/benchmark/Makefile.am
===================================================================
--- src/benchmark/Makefile.am	(revision e958ff8352d8c9f8add30af4b24004f996019960)
+++ src/benchmark/Makefile.am	(revision df47e2fe44d197c175959e907b74622b64a8430e)
@@ -18,5 +18,5 @@
 CFLAGS =
 AM_CFLAGS = -g -Wall -Wno-unused-function -O2
-CC = @CFA_BINDIR@/cfa
+CC = @CFA_BINDIR@/@CFA_NAME@
 
 noinst_PROGRAMS = bench ctxswitch-coroutine ctxswitch-thread
Index: src/benchmark/Makefile.in
===================================================================
--- src/benchmark/Makefile.in	(revision e958ff8352d8c9f8add30af4b24004f996019960)
+++ src/benchmark/Makefile.in	(revision df47e2fe44d197c175959e907b74622b64a8430e)
@@ -94,5 +94,5 @@
 AWK = @AWK@
 BACKEND_CC = @BACKEND_CC@
-CC = @CFA_BINDIR@/cfa
+CC = @CFA_BINDIR@/@CFA_NAME@
 CCAS = @CCAS@
 CCASDEPMODE = @CCASDEPMODE@
@@ -104,4 +104,5 @@
 CFA_INCDIR = @CFA_INCDIR@
 CFA_LIBDIR = @CFA_LIBDIR@
+CFA_NAME = @CFA_NAME@
 CFA_PREFIX = @CFA_PREFIX@
 
Index: src/driver/Makefile.in
===================================================================
--- src/driver/Makefile.in	(revision e958ff8352d8c9f8add30af4b24004f996019960)
+++ src/driver/Makefile.in	(revision df47e2fe44d197c175959e907b74622b64a8430e)
@@ -106,4 +106,5 @@
 CFA_INCDIR = @CFA_INCDIR@
 CFA_LIBDIR = @CFA_LIBDIR@
+CFA_NAME = @CFA_NAME@
 CFA_PREFIX = @CFA_PREFIX@
 CFLAGS = @CFLAGS@
Index: src/examples/Makefile.am
===================================================================
--- src/examples/Makefile.am	(revision e958ff8352d8c9f8add30af4b24004f996019960)
+++ src/examples/Makefile.am	(revision df47e2fe44d197c175959e907b74622b64a8430e)
@@ -18,5 +18,5 @@
 CFLAGS =
 AM_CFLAGS = -g -Wall -Wno-unused-function -O2
-CC = @CFA_BINDIR@/cfa
+CC = @CFA_BINDIR@/@CFA_NAME@
 
 noinst_PROGRAMS = fstream_test vector_test avl_test Bench # build but do not install
Index: src/examples/Makefile.in
===================================================================
--- src/examples/Makefile.in	(revision e958ff8352d8c9f8add30af4b24004f996019960)
+++ src/examples/Makefile.in	(revision df47e2fe44d197c175959e907b74622b64a8430e)
@@ -105,5 +105,5 @@
 AWK = @AWK@
 BACKEND_CC = @BACKEND_CC@
-CC = @CFA_BINDIR@/cfa
+CC = @CFA_BINDIR@/@CFA_NAME@
 CCAS = @CCAS@
 CCASDEPMODE = @CCASDEPMODE@
@@ -115,4 +115,5 @@
 CFA_INCDIR = @CFA_INCDIR@
 CFA_LIBDIR = @CFA_LIBDIR@
+CFA_NAME = @CFA_NAME@
 CFA_PREFIX = @CFA_PREFIX@
 
Index: src/libcfa/Makefile.am
===================================================================
--- src/libcfa/Makefile.am	(revision e958ff8352d8c9f8add30af4b24004f996019960)
+++ src/libcfa/Makefile.am	(revision df47e2fe44d197c175959e907b74622b64a8430e)
@@ -81,3 +81,3 @@
 
 maintainer-clean-local:
-	-rm -rf ${includedir}/*
+	-rm -rf ${includedir}/* ${libdir}/*
Index: src/libcfa/Makefile.in
===================================================================
--- src/libcfa/Makefile.in	(revision e958ff8352d8c9f8add30af4b24004f996019960)
+++ src/libcfa/Makefile.in	(revision df47e2fe44d197c175959e907b74622b64a8430e)
@@ -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}
@@ -315,5 +316,5 @@
 libcfa_d_a_CFLAGS = -debug -O0
 stdhdr = ${shell echo stdhdr/*}
-cfa_includedir = ${CFA_INCDIR}
+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/prelude/Makefile.in
===================================================================
--- src/prelude/Makefile.in	(revision e958ff8352d8c9f8add30af4b24004f996019960)
+++ src/prelude/Makefile.in	(revision df47e2fe44d197c175959e907b74622b64a8430e)
@@ -105,4 +105,5 @@
 CFA_INCDIR = @CFA_INCDIR@
 CFA_LIBDIR = @CFA_LIBDIR@
+CFA_NAME = @CFA_NAME@
 CFA_PREFIX = @CFA_PREFIX@
 CFLAGS = @CFLAGS@
Index: src/tests/Makefile.am
===================================================================
--- src/tests/Makefile.am	(revision e958ff8352d8c9f8add30af4b24004f996019960)
+++ src/tests/Makefile.am	(revision df47e2fe44d197c175959e907b74622b64a8430e)
@@ -30,5 +30,5 @@
 EXTRA_FLAGS =
 CFLAGS = -g -Wall -Wno-unused-function @CFA_FLAGS@ ${EXTRA_FLAGS}
-CC = @CFA_BINDIR@/cfa
+CC = @CFA_BINDIR@/@CFA_NAME@
 
 .PHONY : list
Index: src/tests/Makefile.in
===================================================================
--- src/tests/Makefile.in	(revision e958ff8352d8c9f8add30af4b24004f996019960)
+++ src/tests/Makefile.in	(revision df47e2fe44d197c175959e907b74622b64a8430e)
@@ -113,5 +113,5 @@
 AWK = @AWK@
 BACKEND_CC = @BACKEND_CC@
-CC = @CFA_BINDIR@/cfa
+CC = @CFA_BINDIR@/@CFA_NAME@
 CCAS = @CCAS@
 CCASDEPMODE = @CCASDEPMODE@
@@ -123,4 +123,5 @@
 CFA_INCDIR = @CFA_INCDIR@
 CFA_LIBDIR = @CFA_LIBDIR@
+CFA_NAME = @CFA_NAME@
 CFA_PREFIX = @CFA_PREFIX@
 CFLAGS = -g -Wall -Wno-unused-function @CFA_FLAGS@ ${EXTRA_FLAGS}