Index: driver/cc1.cc
===================================================================
--- driver/cc1.cc	(revision b544afa243b8a4ca826e6ef798b78a8d34f8ea4b)
+++ driver/cc1.cc	(revision 33c849e53f1df1d165d09fdc8bac3b72aaec9aa0)
@@ -10,6 +10,6 @@
 // Created On       : Fri Aug 26 14:23:51 2005
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Aug 26 14:21:22 2019
-// Update Count     : 375
+// Last Modified On : Fri Aug 30 12:47:39 2019
+// Update Count     : 380
 //
 
@@ -33,5 +33,6 @@
 
 
-static string compiler_path( CFA_BACKEND_CC );			// path/name of C compiler
+static string library_path( CFA_LIBDIR );				// cfa-cpp path
+static string compiler_path( CFA_BACKEND_CC );			// C compiler path/name
 static bool CFA_flag = false;							// -CFA flag
 static bool save_temps = false;							// -save-temps flag
@@ -100,5 +101,5 @@
 			} else if ( prefix( val, "-B=" ) ) {		// location of cfa-cpp
 				bprefix = val.substr( 3 );
-			} else {
+			} else {									// normal flag for cfa-cpp
 				args[nargs++] = ( *new string( arg.substr( __CFA_FLAGPREFIX__.size() + 4 ) ) ).c_str();
 			} // if
@@ -430,5 +431,6 @@
 
 	if ( fork() == 0 ) {								// child runs CFA
-		cargs[0] = ( *new string( bprefix + "cfa-cpp" ) ).c_str();
+//		if ( bprefix != library_path ) { cerr << bprefix << " " << library_path << endl; abort(); }
+		cargs[0] = ( *new string( library_path + "cfa-cpp" ) ).c_str();
 		cargs[ncargs++] = cpp_in;