Index: driver/cfa.cc
===================================================================
--- driver/cfa.cc	(revision c2051e106b97c83b3809b5b85c34a13861991d58)
+++ driver/cfa.cc	(revision 81e60f78be23ef2411ac7fc6ebe5521e62bddc9f)
@@ -33,5 +33,5 @@
 using std::to_string;
 
-//#define __DEBUG_H__
+// #define __DEBUG_H__
 
 static string __CFA_FLAGPREFIX__( "__CFA_FLAG" );		// "N__=" suffix
@@ -345,11 +345,11 @@
 
 	if(disttree) {
-		Putenv( argv, "--prelude-dir=" + dir(argv[0])) );
+		Putenv( argv, "--prelude-dir=" + dir(argv[0]) );
 	} else if(intree) {
-		Putenv( argv, "--prelude-dir=" + libdir + "/prelude") );
-	} else {
-		Putenv( argv, "--prelude-dir=" + libdir) );
+		Putenv( argv, "--prelude-dir=" + libdir + "/prelude" );
+	} else {
+		Putenv( argv, "--prelude-dir=" + libdir );
 	}
-	nargs += 1;
+
 	for ( int i = 0; i < nlibs; i += 1 ) {				// copy non-user libraries after all user libraries
 		args[nargs++] = libs[i];
@@ -402,6 +402,4 @@
 	} // if
 
-	Putenv( argv, "--prelude-dir=" + libdir + (intree ? "/prelude" : "") );
-
 	if ( debug ) {
 		heading += " (debug)";
@@ -420,5 +418,5 @@
 		}
 		if ( bprefix[bprefix.length() - 1] != '/' ) bprefix += '/';
-		Putenv( argv, ( *new string( string("-B=") + bprefix ) ).c_str() );
+		Putenv( argv, string("-B=") + bprefix );
 	} // if
 
Index: libcfa/Makefile.in
===================================================================
--- libcfa/Makefile.in	(revision c2051e106b97c83b3809b5b85c34a13861991d58)
+++ libcfa/Makefile.in	(revision 81e60f78be23ef2411ac7fc6ebe5521e62bddc9f)
@@ -275,4 +275,5 @@
 LIPO = @LIPO@
 LN_S = @LN_S@
+LOCAL_CC1 = @LOCAL_CC1@
 LOCAL_CFACC = @LOCAL_CFACC@
 LTLIBOBJS = @LTLIBOBJS@
Index: libcfa/configure
===================================================================
--- libcfa/configure	(revision c2051e106b97c83b3809b5b85c34a13861991d58)
+++ libcfa/configure	(revision 81e60f78be23ef2411ac7fc6ebe5521e62bddc9f)
@@ -709,4 +709,5 @@
 PRELUDEFLAG
 CFADIR_HASH
+LOCAL_CC1
 LOCAL_CFACC
 CFACPP
@@ -2972,4 +2973,5 @@
 CFACPP=${DRIVER_DIR}cfa-cpp
 LOCAL_CFACC=${DRIVER_DIR}cfa
+LOCAL_CC1=${DRIVER_DIR}cc1
 
  if test x$enable_distcc = xyes; then
@@ -2980,4 +2982,5 @@
   ENABLE_DISTCC_FALSE=
 fi
+
 
 
Index: libcfa/configure.ac
===================================================================
--- libcfa/configure.ac	(revision c2051e106b97c83b3809b5b85c34a13861991d58)
+++ libcfa/configure.ac	(revision 81e60f78be23ef2411ac7fc6ebe5521e62bddc9f)
@@ -47,4 +47,5 @@
 CFACPP=${DRIVER_DIR}cfa-cpp
 LOCAL_CFACC=${DRIVER_DIR}cfa
+LOCAL_CC1=${DRIVER_DIR}cc1
 
 AM_CONDITIONAL([ENABLE_DISTCC], [test x$enable_distcc = xyes])
@@ -53,4 +54,5 @@
 AC_SUBST(CFACPP)
 AC_SUBST(LOCAL_CFACC)
+AC_SUBST(LOCAL_CC1)
 AC_SUBST(CFADIR_HASH)
 AC_SUBST(CFA_VERSION)
Index: libcfa/prelude/Makefile.am
===================================================================
--- libcfa/prelude/Makefile.am	(revision c2051e106b97c83b3809b5b85c34a13861991d58)
+++ libcfa/prelude/Makefile.am	(revision 81e60f78be23ef2411ac7fc6ebe5521e62bddc9f)
@@ -70,5 +70,5 @@
 
 if ENABLE_DISTCC
-distribution: @LOCAL_CFACC@ @CFACPP@ gcc-builtins.cf builtins.cf extras.cf prelude.cfa bootloader.c $(srcdir)/../../tools/build/push2dist.sh
+distribution: @LOCAL_CFACC@ @LOCAL_CC1@ @CFACPP@ gcc-builtins.cf builtins.cf extras.cf prelude.cfa bootloader.c $(srcdir)/../../tools/build/push2dist.sh
 	${AM_V_GEN}$(srcdir)/../../tools/build/push2dist.sh @CFADIR_HASH@
 	@echo "Dummy file to track distribution to remote hosts" > ${@}
Index: libcfa/prelude/Makefile.in
===================================================================
--- libcfa/prelude/Makefile.in	(revision c2051e106b97c83b3809b5b85c34a13861991d58)
+++ libcfa/prelude/Makefile.in	(revision 81e60f78be23ef2411ac7fc6ebe5521e62bddc9f)
@@ -218,4 +218,5 @@
 LIPO = @LIPO@
 LN_S = @LN_S@
+LOCAL_CC1 = @LOCAL_CC1@
 LOCAL_CFACC = @LOCAL_CFACC@
 LTLIBOBJS = @LTLIBOBJS@
@@ -570,5 +571,5 @@
 	rm -rf $(DEPDIR)
 
-@ENABLE_DISTCC_TRUE@distribution: @LOCAL_CFACC@ @CFACPP@ gcc-builtins.cf builtins.cf extras.cf prelude.cfa bootloader.c $(srcdir)/../../tools/build/push2dist.sh
+@ENABLE_DISTCC_TRUE@distribution: @LOCAL_CFACC@ @LOCAL_CC1@ @CFACPP@ gcc-builtins.cf builtins.cf extras.cf prelude.cfa bootloader.c $(srcdir)/../../tools/build/push2dist.sh
 @ENABLE_DISTCC_TRUE@	${AM_V_GEN}$(srcdir)/../../tools/build/push2dist.sh @CFADIR_HASH@
 @ENABLE_DISTCC_TRUE@	@echo "Dummy file to track distribution to remote hosts" > ${@}
Index: libcfa/src/Makefile.in
===================================================================
--- libcfa/src/Makefile.in	(revision c2051e106b97c83b3809b5b85c34a13861991d58)
+++ libcfa/src/Makefile.in	(revision 81e60f78be23ef2411ac7fc6ebe5521e62bddc9f)
@@ -328,4 +328,5 @@
 LIPO = @LIPO@
 LN_S = @LN_S@
+LOCAL_CC1 = @LOCAL_CC1@
 LOCAL_CFACC = @LOCAL_CFACC@
 LTLIBOBJS = @LTLIBOBJS@