Index: src/driver/cfa.cc
===================================================================
--- src/driver/cfa.cc	(revision 90592137ba64a318983658fd3c7acaa5e30676c6)
+++ src/driver/cfa.cc	(revision ec129c41602fc1e6b8d76d388878e9e9d18535c3)
@@ -10,6 +10,6 @@
 // Created On       : Tue Aug 20 13:44:49 2002
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Aug  6 16:14:55 2016
-// Update Count     : 148
+// Last Modified On : Tue Oct 25 21:29:48 2016
+// Update Count     : 152
 //
 
@@ -51,19 +51,5 @@
 int main( int argc, char *argv[] ) {
 	string Version( VERSION );							// current version number from CONFIG
-	string Major( "0" ), Minor( "0" ), Patch( "0" );	// default version numbers
-
-	int posn1 = Version.find( "." );					// find the divider between major and minor version numbers
-	if ( posn1 == -1 ) {								// not there ?
-		Major = Version;
-	} else {
-		Major = Version.substr( 0, posn1 );
-		int posn2 = Version.find( ".", posn1 + 1 );		// find the divider between minor and patch numbers
-		if ( posn2 == -1 ) {							// not there ?
-			Minor = Version.substr( posn1 );
-		} else {
-			Minor = Version.substr( posn1 + 1, posn2 - posn1 - 1 );
-			Patch = Version.substr( posn2 + 1 );
-		} // if
-	} // if
+	string Major( CFA_VERSION_MAJOR ), Minor( CFA_VERSION_MINOR ), Patch( CFA_VERSION_MINOR );
 
 	string installincdir( CFA_INCDIR );					// fixed location of include files
@@ -268,9 +254,9 @@
 	// add the correct set of flags based on the type of compile this is
 
-	args[nargs] = ( *new string( string("-D__CFA__=") + Major ) ).c_str();
+	args[nargs] = ( *new string( string("-D__CFA_MAJOR__=") + Major ) ).c_str();
 	nargs += 1;
 	args[nargs] = ( *new string( string("-D__CFA_MINOR__=") + Minor ) ).c_str();
 	nargs += 1;
-	args[nargs] = ( *new string( string("-D__CFA_PATCHLEVEL__=") + Patch ) ).c_str();
+	args[nargs] = ( *new string( string("-D__CFA_PATCH__=") + Patch ) ).c_str();
 	nargs += 1;
 	args[nargs] = "-D__CFA__";