Index: Makefile.in
===================================================================
--- Makefile.in	(revision 34e1494bbcc17cbde2f469d23ea2db3b4585e6cb)
+++ Makefile.in	(revision 158b026fb8f759ed1b6cebe96e8a07ccb25235cb)
@@ -264,4 +264,5 @@
 CCDEPMODE = @CCDEPMODE@
 CFACC = @CFACC@
+CFACC_INSTALL = @CFACC_INSTALL@
 CFACPP = @CFACPP@
 CFA_BACKEND_CC = @CFA_BACKEND_CC@
Index: benchmark/Makefile.in
===================================================================
--- benchmark/Makefile.in	(revision 34e1494bbcc17cbde2f469d23ea2db3b4585e6cb)
+++ benchmark/Makefile.in	(revision 158b026fb8f759ed1b6cebe96e8a07ccb25235cb)
@@ -214,4 +214,5 @@
 CCDEPMODE = @CCDEPMODE@
 CFACC = @CFACC@
+CFACC_INSTALL = @CFACC_INSTALL@
 CFACPP = @CFACPP@
 CFA_BACKEND_CC = @CFA_BACKEND_CC@
Index: configure
===================================================================
--- configure	(revision 34e1494bbcc17cbde2f469d23ea2db3b4585e6cb)
+++ configure	(revision 158b026fb8f759ed1b6cebe96e8a07ccb25235cb)
@@ -715,4 +715,5 @@
 BUILD_IN_TREE_FLAGS
 CFACPP
+CFACC_INSTALL
 CFACC
 DRIVER_DIR
@@ -3303,5 +3304,7 @@
 DRIVER_DIR=${TOP_BUILDDIR}driver/
 CFACC=${DRIVER_DIR}cfa
+CFACC_INSTALL=${CFA_BINDIR}${CFA_NAME}
 CFACPP=${DRIVER_DIR}cfa-cpp
+
 
 
Index: configure.ac
===================================================================
--- configure.ac	(revision 34e1494bbcc17cbde2f469d23ea2db3b4585e6cb)
+++ configure.ac	(revision 158b026fb8f759ed1b6cebe96e8a07ccb25235cb)
@@ -93,7 +93,9 @@
 DRIVER_DIR=${TOP_BUILDDIR}driver/
 CFACC=${DRIVER_DIR}cfa
+CFACC_INSTALL=${CFA_BINDIR}${CFA_NAME}
 CFACPP=${DRIVER_DIR}cfa-cpp
 AC_SUBST(DRIVER_DIR)
 AC_SUBST(CFACC)
+AC_SUBST(CFACC_INSTALL)
 AC_SUBST(CFACPP)
 
Index: driver/Makefile.in
===================================================================
--- driver/Makefile.in	(revision 34e1494bbcc17cbde2f469d23ea2db3b4585e6cb)
+++ driver/Makefile.in	(revision 158b026fb8f759ed1b6cebe96e8a07ccb25235cb)
@@ -201,4 +201,5 @@
 CCDEPMODE = @CCDEPMODE@
 CFACC = @CFACC@
+CFACC_INSTALL = @CFACC_INSTALL@
 CFACPP = @CFACPP@
 CFA_BACKEND_CC = @CFA_BACKEND_CC@
Index: driver/cfa.cc
===================================================================
--- driver/cfa.cc	(revision 34e1494bbcc17cbde2f469d23ea2db3b4585e6cb)
+++ driver/cfa.cc	(revision 158b026fb8f759ed1b6cebe96e8a07ccb25235cb)
@@ -15,10 +15,11 @@
 
 #include <iostream>
-#include <cstdio>										// perror
-#include <cstdlib>										// putenv, exit
-#include <unistd.h>										// execvp
-#include <string>										// STL version
-#include <string.h>										// strcmp
-#include <algorithm>									// find
+#include <cstdio>      // perror
+#include <cstdlib>     // putenv, exit
+#include <climits>     // PATH_MAX
+#include <unistd.h>    // execvp
+#include <string>      // STL version
+#include <string.h>    // strcmp
+#include <algorithm>   // find
 
 #include <sys/types.h>
@@ -35,5 +36,6 @@
 // #define __DEBUG_H__
 
-static string __CFA_FLAGPREFIX__( "__CFA_FLAG" );		// "N__=" suffix
+// "N__=" suffix
+static string __CFA_FLAGPREFIX__( "__CFA_FLAG" );
 
 void Putenv( char * argv[], string arg ) {
@@ -57,5 +59,6 @@
 }
 
-bool suffix( const string & arg ) {						// check if string has suffix
+// check if string has suffix
+bool suffix( const string & arg ) {
 	enum { NumSuffixes = 3 };
 	static const string suffixes[NumSuffixes] = { "cfa", "hfa", "ifa" };
@@ -76,4 +79,41 @@
 static inline string dir(const string & path) {
 	return path.substr(0, path.find_last_of('/'));
+}
+
+// Different path modes
+enum PathMode {
+	Installed,     // cfa is installed, use prefix
+	BuildTree,     // cfa is in the tree, use source and build tree
+	Distributed    // cfa is distributed, use build tree for includes and executable directory for .cfs
+};
+
+// Get path mode from /proc
+PathMode FromProc() {
+	std::string abspath;
+	abspath.resize(PATH_MAX);
+
+	// get executable path from /proc/self/exe
+	ssize_t size = readlink("/proc/self/exe", const_cast<char*>(abspath.c_str()), abspath.size());
+	if(size <= 0) {
+		std::cerr << "Error could not evaluate absolute path from /proc/self/exe" << std::endl;
+		std::cerr << "Failed with " << std::strerror(errno) << std::endl;
+		std::exit(1);
+	}
+
+	// Trim extra characters
+	abspath.resize(size);
+
+	// Are we installed
+	if(abspath.rfind(CFA_BINDIR  , 0) == 0) { return Installed; }
+
+	// Is this the build tree
+	if(abspath.rfind(TOP_BUILDDIR, 0) == 0) { return BuildTree; }
+
+	// Does this look like distcc
+	if(abspath.find("/.cfadistcc/") != std::string::npos) { return Distributed; }
+
+	// None of the above? Give up since we don't know where the prelude or include directories are
+	std::cerr << "Cannot find required files from excutable path " << abspath << std::endl;
+	std::exit(1);
 }
 
@@ -113,8 +153,8 @@
 	bool m32 = false;									// -m32 flag
 	bool m64 = false;									// -m64 flag
-	bool intree = false;								// build in tree
 	bool compiling_libs = false;
-	bool disttree = false;
 	int o_file = 0;										// -o filename position
+
+	PathMode path = FromProc();
 
 	const char *args[argc + 100];						// cfa command line values, plus some space for additional flags
@@ -171,8 +211,4 @@
 			} else if ( arg == "-no-include-stdhdr" ) {
 				noincstd_flag = true;					// strip the no-include-stdhdr flag
-			} else if ( arg == "-in-tree" ) {
-				intree = true;
-			} else if ( arg == "-dist-tree" ) {
-				disttree = true;
 			} else if ( arg == "-cfalib") {
 				compiling_libs = true;
@@ -283,18 +319,29 @@
 
 	// add the CFA include-library paths, which allow direct access to header files without directory qualification
-	if ( ! intree ) {
+	string libbase;
+	switch(path) {
+	case Installed:
 		args[nargs++] = "-I" CFA_INCDIR;
-		if ( ! noincstd_flag ) {						// do not use during build
+		// do not use during build
+		if ( ! noincstd_flag ) {
 			args[nargs++] = "-I" CFA_INCDIR "stdhdr";
 		} // if
 		args[nargs++] = "-I" CFA_INCDIR "concurrency";
 		args[nargs++] = "-I" CFA_INCDIR "containers";
-	} else {
+		libbase = CFA_LIBDIR;
+		break;
+	case BuildTree:
+	case Distributed:
 		args[nargs++] = "-I" TOP_SRCDIR "libcfa/src";
-		if ( ! noincstd_flag ) {						// do not use during build
+		// do not use during build
+		if ( ! noincstd_flag ) {
 			args[nargs++] = "-I" TOP_SRCDIR "libcfa/src" "/stdhdr";
 		} // if
 		args[nargs++] = "-I" TOP_SRCDIR "libcfa/src" "/concurrency";
 		args[nargs++] = "-I" TOP_SRCDIR "libcfa/src" "/containers";
+
+		libbase = TOP_BUILDDIR "libcfa/";
+
+		break;
 	} // if
 
@@ -302,11 +349,4 @@
 	args[nargs++] = "-imacros";
 	args[nargs++] = "stdbool.h";
-
-	string libbase;
-	if ( ! intree ) {
-		libbase = CFA_LIBDIR;
-	} else {
-		libbase = TOP_BUILDDIR "libcfa/";
-	} // if
 
 	if( compiling_libs ) {
@@ -326,5 +366,5 @@
 	string libdir = libbase + arch + "-" + config;
 
-	if (!disttree) {
+	if (path != Distributed) {
 		if ( ! nolib && ! dirExists( libdir ) ) {
 			cerr << argv[0] << " internal error, configuration " << config << " not installed." << endl;
@@ -344,10 +384,8 @@
 	} // if
 
-	if(disttree) {
-		Putenv( argv, "--prelude-dir=" + dir(argv[0]) );
-	} else if(intree) {
-		Putenv( argv, "--prelude-dir=" + libdir + "/prelude" );
-	} else {
-		Putenv( argv, "--prelude-dir=" + libdir );
+	switch(path) {
+	case Installed   : Putenv( argv, "--prelude-dir=" + libdir ); break;
+	case BuildTree   : Putenv( argv, "--prelude-dir=" + libdir + "/prelude" ); break;
+	case Distributed : Putenv( argv, "--prelude-dir=" + dir(argv[0]) ); break;
 	}
 
@@ -365,6 +403,6 @@
 
 		// include the cfa library in case it is needed
-		args[nargs++] = ( *new string( string("-L" ) + libdir + (intree ? "/src/.libs" : "")) ).c_str();
-		args[nargs++] = ( *new string( string("-Wl,-rpath," ) + libdir + (intree ? "/src/.libs" : "")) ).c_str();
+		args[nargs++] = ( *new string( string("-L" ) + libdir + (path != Installed ? "/src/.libs" : "")) ).c_str();
+		args[nargs++] = ( *new string( string("-Wl,-rpath," ) + libdir + (path != Installed ? "/src/.libs" : "")) ).c_str();
 		args[nargs++] = "-Wl,--push-state,--as-needed";
 		args[nargs++] = "-lcfathread";
@@ -410,10 +448,8 @@
 
 	if ( bprefix.length() == 0 ) {
-		if(disttree) {
-			bprefix = dir(argv[0]);
-		} else if(intree) {
-			bprefix = srcdriverdir;
-		} else {
-			bprefix = installlibdir;
+		switch(path) {
+		case Installed   : bprefix = installlibdir; break;
+		case BuildTree   : bprefix = srcdriverdir ; break;
+		case Distributed : bprefix = dir(argv[0]) ; break;
 		}
 		if ( bprefix[bprefix.length() - 1] != '/' ) bprefix += '/';
Index: libcfa/Makefile.in
===================================================================
--- libcfa/Makefile.in	(revision 34e1494bbcc17cbde2f469d23ea2db3b4585e6cb)
+++ libcfa/Makefile.in	(revision 158b026fb8f759ed1b6cebe96e8a07ccb25235cb)
@@ -296,5 +296,4 @@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-PRELUDEFLAG = @PRELUDEFLAG@
 RANLIB = @RANLIB@
 SED = @SED@
Index: libcfa/configure
===================================================================
--- libcfa/configure	(revision 34e1494bbcc17cbde2f469d23ea2db3b4585e6cb)
+++ libcfa/configure	(revision 158b026fb8f759ed1b6cebe96e8a07ccb25235cb)
@@ -707,5 +707,4 @@
 CONFIG_CFLAGS
 ARCH_FLAGS
-PRELUDEFLAG
 CFADIR_HASH
 LOCAL_CC1
@@ -2960,5 +2959,4 @@
 if test x$enable_distcc = xno; then
 	CFACC=${DRIVER_DIR}cfa
-	PRELUDEFLAG='-in-tree'
 	echo "no"
 else
@@ -2968,5 +2966,4 @@
 	CFADIR_HASH=$($tools/distcc_hash $config)
 	CFACC="distcc ~/.cfadistcc/${CFADIR_HASH}/cfa"
-	PRELUDEFLAG='-dist-tree'
 	echo "yes (hash=${CFADIR_HASH})"
 fi
@@ -2982,5 +2979,4 @@
   ENABLE_DISTCC_FALSE=
 fi
-
 
 
Index: libcfa/configure.ac
===================================================================
--- libcfa/configure.ac	(revision 34e1494bbcc17cbde2f469d23ea2db3b4585e6cb)
+++ libcfa/configure.ac	(revision 158b026fb8f759ed1b6cebe96e8a07ccb25235cb)
@@ -34,5 +34,4 @@
 if test x$enable_distcc = xno; then
 	CFACC=${DRIVER_DIR}cfa
-	PRELUDEFLAG='-in-tree'
 	echo "no"
 else
@@ -42,5 +41,4 @@
 	CFADIR_HASH=$($tools/distcc_hash $config)
 	CFACC="distcc ~/.cfadistcc/${CFADIR_HASH}/cfa"
-	PRELUDEFLAG='-dist-tree'
 	echo "yes (hash=${CFADIR_HASH})"
 fi
@@ -57,5 +55,4 @@
 AC_SUBST(CFADIR_HASH)
 AC_SUBST(CFA_VERSION)
-AC_SUBST(PRELUDEFLAG)
 
 #==============================================================================
Index: libcfa/prelude/Makefile.in
===================================================================
--- libcfa/prelude/Makefile.in	(revision 34e1494bbcc17cbde2f469d23ea2db3b4585e6cb)
+++ libcfa/prelude/Makefile.in	(revision 158b026fb8f759ed1b6cebe96e8a07ccb25235cb)
@@ -239,5 +239,4 @@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-PRELUDEFLAG = @PRELUDEFLAG@
 RANLIB = @RANLIB@
 SED = @SED@
Index: libcfa/src/Makefile.am
===================================================================
--- libcfa/src/Makefile.am	(revision 34e1494bbcc17cbde2f469d23ea2db3b4585e6cb)
+++ libcfa/src/Makefile.am	(revision 158b026fb8f759ed1b6cebe96e8a07ccb25235cb)
@@ -32,5 +32,5 @@
 # use -no-include-stdhdr to prevent rebuild cycles
 # The built sources must not depend on the installed headers
-AM_CFAFLAGS = -quiet -cfalib @PRELUDEFLAG@ -I$(srcdir)/stdhdr $(if $(findstring ${gdbwaittarget}, ${@}), -XCFA --gdb) @CONFIG_CFAFLAGS@
+AM_CFAFLAGS = -quiet -cfalib -I$(srcdir)/stdhdr $(if $(findstring ${gdbwaittarget}, ${@}), -XCFA --gdb) @CONFIG_CFAFLAGS@
 AM_CFLAGS = -g -Wall -Wno-unused-function -fPIC @ARCH_FLAGS@ @CONFIG_CFLAGS@
 AM_CCASFLAGS = -g -Wall -Wno-unused-function @ARCH_FLAGS@ @CONFIG_CFLAGS@
@@ -96,9 +96,9 @@
 
 prelude.o : prelude.cfa extras.cf gcc-builtins.cf builtins.cf @LOCAL_CFACC@ @CFACPP@
-	${AM_V_GEN}$(CFACOMPILE) -quiet @PRELUDEFLAG@ -XCFA -l ${<} -c -o ${@}
+	${AM_V_GEN}$(CFACOMPILE) -quiet -XCFA -l ${<} -c -o ${@}
 
 prelude.lo: prelude.cfa extras.cf gcc-builtins.cf builtins.cf @LOCAL_CFACC@ @CFACPP@
 	${AM_V_GEN}$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile \
-	$(CFACOMPILE) -quiet @PRELUDEFLAG@ -XCFA -l ${<} -c -o ${@}
+	$(CFACOMPILE) -quiet -XCFA -l ${<} -c -o ${@}
 
 #----------------------------------------------------------------------------------------------------------------
Index: libcfa/src/Makefile.in
===================================================================
--- libcfa/src/Makefile.in	(revision 34e1494bbcc17cbde2f469d23ea2db3b4585e6cb)
+++ libcfa/src/Makefile.in	(revision 158b026fb8f759ed1b6cebe96e8a07ccb25235cb)
@@ -349,5 +349,4 @@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-PRELUDEFLAG = @PRELUDEFLAG@
 RANLIB = @RANLIB@
 SED = @SED@
@@ -445,5 +444,5 @@
 # use -no-include-stdhdr to prevent rebuild cycles
 # The built sources must not depend on the installed headers
-AM_CFAFLAGS = -quiet -cfalib @PRELUDEFLAG@ -I$(srcdir)/stdhdr $(if $(findstring ${gdbwaittarget}, ${@}), -XCFA --gdb) @CONFIG_CFAFLAGS@
+AM_CFAFLAGS = -quiet -cfalib -I$(srcdir)/stdhdr $(if $(findstring ${gdbwaittarget}, ${@}), -XCFA --gdb) @CONFIG_CFAFLAGS@
 AM_CFLAGS = -g -Wall -Wno-unused-function -fPIC @ARCH_FLAGS@ @CONFIG_CFLAGS@
 AM_CCASFLAGS = -g -Wall -Wno-unused-function @ARCH_FLAGS@ @CONFIG_CFLAGS@
@@ -954,9 +953,9 @@
 
 prelude.o : prelude.cfa extras.cf gcc-builtins.cf builtins.cf @LOCAL_CFACC@ @CFACPP@
-	${AM_V_GEN}$(CFACOMPILE) -quiet @PRELUDEFLAG@ -XCFA -l ${<} -c -o ${@}
+	${AM_V_GEN}$(CFACOMPILE) -quiet -XCFA -l ${<} -c -o ${@}
 
 prelude.lo: prelude.cfa extras.cf gcc-builtins.cf builtins.cf @LOCAL_CFACC@ @CFACPP@
 	${AM_V_GEN}$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile \
-	$(CFACOMPILE) -quiet @PRELUDEFLAG@ -XCFA -l ${<} -c -o ${@}
+	$(CFACOMPILE) -quiet -XCFA -l ${<} -c -o ${@}
 
 #----------------------------------------------------------------------------------------------------------------
Index: longrun_tests/Makefile.in
===================================================================
--- longrun_tests/Makefile.in	(revision 34e1494bbcc17cbde2f469d23ea2db3b4585e6cb)
+++ longrun_tests/Makefile.in	(revision 158b026fb8f759ed1b6cebe96e8a07ccb25235cb)
@@ -348,4 +348,5 @@
 CCDEPMODE = @CCDEPMODE@
 CFACC = @CFACC@
+CFACC_INSTALL = @CFACC_INSTALL@
 CFACPP = @CFACPP@
 CFA_BACKEND_CC = @CFA_BACKEND_CC@
Index: src/Makefile.in
===================================================================
--- src/Makefile.in	(revision 34e1494bbcc17cbde2f469d23ea2db3b4585e6cb)
+++ src/Makefile.in	(revision 158b026fb8f759ed1b6cebe96e8a07ccb25235cb)
@@ -411,4 +411,5 @@
 CCDEPMODE = @CCDEPMODE@
 CFACC = @CFACC@
+CFACC_INSTALL = @CFACC_INSTALL@
 CFACPP = @CFACPP@
 CFA_BACKEND_CC = @CFA_BACKEND_CC@
Index: tests/Makefile.am
===================================================================
--- tests/Makefile.am	(revision 34e1494bbcc17cbde2f469d23ea2db3b4585e6cb)
+++ tests/Makefile.am	(revision 158b026fb8f759ed1b6cebe96e8a07ccb25235cb)
@@ -24,5 +24,4 @@
 archiveerrors=
 
-INSTALL_FLAGS=-in-tree
 DEBUG_FLAGS=-debug -O0
 
@@ -43,6 +42,9 @@
 	-DIN_DIR="${abs_srcdir}/.in/"
 
+# get the desired cfa to test
+TARGET_CFA = $(if $(filter $(installed),yes), @CFACC_INSTALL@, @CFACC@)
+
 # adjust CC to current flags
-CC = $(if $(DISTCC_CFA_PATH),distcc $(DISTCC_CFA_PATH) -dist-tree -in-tree,@CFACC@ ${DEBUG_FLAGS} ${INSTALL_FLAGS} ${ARCH_FLAGS})
+CC = $(if $(ifeq $(DISTCC_CFA_PATH),yes),distcc $(DISTCC_CFA_PATH),$(TARGET_CFA) ${DEBUG_FLAGS} ${ARCH_FLAGS})
 CFACC = $(CC)
 
@@ -51,5 +53,5 @@
 
 # adjusted CC but without the actual distcc call
-CFACCLOCAL = $(if $(DISTCC_CFA_PATH),$(DISTCC_CFA_PATH) -dist-tree -in-tree,@CFACC@ ${DEBUG_FLAGS} ${INSTALL_FLAGS} ${ARCH_FLAGS})
+CFACCLOCAL = $(if $(DISTCC_CFA_PATH),$(DISTCC_CFA_PATH),$(TARGET_CFA) ${DEBUG_FLAGS} ${ARCH_FLAGS})
 
 PRETTY_PATH=mkdir -p $(dir $(abspath ${@})) && cd ${srcdir} &&
Index: tests/Makefile.in
===================================================================
--- tests/Makefile.in	(revision 34e1494bbcc17cbde2f469d23ea2db3b4585e6cb)
+++ tests/Makefile.in	(revision 158b026fb8f759ed1b6cebe96e8a07ccb25235cb)
@@ -214,5 +214,5 @@
 
 # adjust CC to current flags
-CC = $(if $(DISTCC_CFA_PATH),distcc $(DISTCC_CFA_PATH) -dist-tree -in-tree,@CFACC@ ${DEBUG_FLAGS} ${INSTALL_FLAGS} ${ARCH_FLAGS})
+CC = $(if $(ifeq $(DISTCC_CFA_PATH),yes),distcc $(DISTCC_CFA_PATH),$(TARGET_CFA) ${DEBUG_FLAGS} ${ARCH_FLAGS})
 CCAS = @CCAS@
 CCASDEPMODE = @CCASDEPMODE@
@@ -220,4 +220,5 @@
 CCDEPMODE = @CCDEPMODE@
 CFACC = $(CC)
+CFACC_INSTALL = @CFACC_INSTALL@
 CFACPP = @CFACPP@
 CFA_BACKEND_CC = @CFA_BACKEND_CC@
@@ -381,5 +382,4 @@
 installed = no
 archiveerrors = 
-INSTALL_FLAGS = -in-tree
 DEBUG_FLAGS = -debug -O0
 quick_test = avl_test operators numericConstants expression enum array typeof cast raii/dtor-early-exit raii/init_once attributes
@@ -398,9 +398,12 @@
 
 
+# get the desired cfa to test
+TARGET_CFA = $(if $(filter $(installed),yes), @CFACC_INSTALL@, @CFACC@)
+
 # get local binary for depedencies
 CFACCBIN = @CFACC@
 
 # adjusted CC but without the actual distcc call
-CFACCLOCAL = $(if $(DISTCC_CFA_PATH),$(DISTCC_CFA_PATH) -dist-tree -in-tree,@CFACC@ ${DEBUG_FLAGS} ${INSTALL_FLAGS} ${ARCH_FLAGS})
+CFACCLOCAL = $(if $(DISTCC_CFA_PATH),$(DISTCC_CFA_PATH),$(TARGET_CFA) ${DEBUG_FLAGS} ${ARCH_FLAGS})
 PRETTY_PATH = mkdir -p $(dir $(abspath ${@})) && cd ${srcdir} &&
 avl_test_SOURCES = avltree/avl_test.cfa avltree/avl0.cfa avltree/avl1.cfa avltree/avl2.cfa avltree/avl3.cfa avltree/avl4.cfa avltree/avl-private.cfa
Index: tests/pybin/settings.py
===================================================================
--- tests/pybin/settings.py	(revision 34e1494bbcc17cbde2f469d23ea2db3b4585e6cb)
+++ tests/pybin/settings.py	(revision 158b026fb8f759ed1b6cebe96e8a07ccb25235cb)
@@ -97,5 +97,5 @@
 
 		self.string = "installed" if value else "in-tree"
-		self.flags  = """INSTALL_FLAGS=%s""" % ("" if value else "-in-tree")
+		self.flags  = """installed=%s""" % ("yes" if value else "no")
 
 class Timeouts:
Index: tools/Makefile.in
===================================================================
--- tools/Makefile.in	(revision 34e1494bbcc17cbde2f469d23ea2db3b4585e6cb)
+++ tools/Makefile.in	(revision 158b026fb8f759ed1b6cebe96e8a07ccb25235cb)
@@ -208,4 +208,5 @@
 CCDEPMODE = @CCDEPMODE@
 CFACC = @CFACC@
+CFACC_INSTALL = @CFACC_INSTALL@
 CFACPP = @CFACPP@
 CFA_BACKEND_CC = @CFA_BACKEND_CC@
Index: tools/prettyprinter/Makefile.in
===================================================================
--- tools/prettyprinter/Makefile.in	(revision 34e1494bbcc17cbde2f469d23ea2db3b4585e6cb)
+++ tools/prettyprinter/Makefile.in	(revision 158b026fb8f759ed1b6cebe96e8a07ccb25235cb)
@@ -237,4 +237,5 @@
 CCDEPMODE = @CCDEPMODE@
 CFACC = @CFACC@
+CFACC_INSTALL = @CFACC_INSTALL@
 CFACPP = @CFACPP@
 CFA_BACKEND_CC = @CFA_BACKEND_CC@