Index: configure
===================================================================
--- configure	(revision 5e0fa1f6d72bfdc872210ac0c47e51e8ad1620a2)
+++ configure	(revision faf8857316238fb243bc16493862a605ed9b5e6e)
@@ -2999,5 +2999,5 @@
  	cfa_incdir="${cfa_prefix}/include"
 else
- 	cfa_incdir=${$includedir}
+ 	cfa_incdir=${includedir}
 fi
 
Index: configure.ac
===================================================================
--- configure.ac	(revision 5e0fa1f6d72bfdc872210ac0c47e51e8ad1620a2)
+++ configure.ac	(revision faf8857316238fb243bc16493862a605ed9b5e6e)
@@ -41,5 +41,5 @@
  	cfa_incdir="${cfa_prefix}/include"
 else
- 	cfa_incdir=${$includedir}
+ 	cfa_incdir=${includedir}
 fi 
 AC_DEFINE_UNQUOTED(CFA_INCDIR, "${cfa_incdir}", [Location of include files.])
Index: src/Makefile.in
===================================================================
--- src/Makefile.in	(revision 5e0fa1f6d72bfdc872210ac0c47e51e8ad1620a2)
+++ src/Makefile.in	(revision faf8857316238fb243bc16493862a605ed9b5e6e)
@@ -413,7 +413,7 @@
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu src/Makefile
+	  $(AUTOMAKE) --foreign src/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
Index: src/driver/Makefile.in
===================================================================
--- src/driver/Makefile.in	(revision 5e0fa1f6d72bfdc872210ac0c47e51e8ad1620a2)
+++ src/driver/Makefile.in	(revision faf8857316238fb243bc16493862a605ed9b5e6e)
@@ -195,7 +195,7 @@
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/driver/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/driver/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu src/driver/Makefile
+	  $(AUTOMAKE) --foreign src/driver/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
Index: src/examples/Makefile.in
===================================================================
--- src/examples/Makefile.in	(revision 5e0fa1f6d72bfdc872210ac0c47e51e8ad1620a2)
+++ src/examples/Makefile.in	(revision faf8857316238fb243bc16493862a605ed9b5e6e)
@@ -191,7 +191,7 @@
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/examples/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/examples/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu src/examples/Makefile
+	  $(AUTOMAKE) --foreign src/examples/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
Index: src/libcfa/Makefile.in
===================================================================
--- src/libcfa/Makefile.in	(revision 5e0fa1f6d72bfdc872210ac0c47e51e8ad1620a2)
+++ src/libcfa/Makefile.in	(revision faf8857316238fb243bc16493862a605ed9b5e6e)
@@ -220,7 +220,7 @@
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/libcfa/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/libcfa/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu src/libcfa/Makefile
+	  $(AUTOMAKE) --foreign src/libcfa/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
Index: src/main.cc
===================================================================
--- src/main.cc	(revision 5e0fa1f6d72bfdc872210ac0c47e51e8ad1620a2)
+++ src/main.cc	(revision faf8857316238fb243bc16493862a605ed9b5e6e)
@@ -10,6 +10,6 @@
 // Created On       : Fri May 15 23:12:02 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Dec 17 07:26:03 2015
-// Update Count     : 171
+// Last Modified On : Thu Dec 17 12:59:06 2015
+// Update Count     : 179
 //
 
@@ -187,6 +187,6 @@
 		// read in the builtins and the prelude
 		if ( ! nopreludep ) {							// include gcc builtins
-			// -l is for initial build and builtins.cf is not in the lib directory yet so access it here.
-			FILE * builtins = fopen( libcfap ? CFA_PREFIX "/src/libcfa" "/builtins.cf" : "libcfa/builtins.cf", "r" );
+			// -l is for initial build ONLY and builtins.cf is not in the lib directory so access it here.
+			FILE * builtins = fopen( libcfap ? "./builtins.cf" : CFA_LIBDIR "/builtins.cf", "r" );
 			if ( builtins == NULL ) {
 				std::cerr << "Error: can't open builtins" << std::endl;
@@ -197,5 +197,5 @@
 
 			if ( ! libcfap ) {
-				// read the prelude in, if we're not generating the cfa library
+				// read the prelude in, if not generating the cfa library
 				FILE * prelude = fopen( CFA_LIBDIR "/prelude.cf", "r" );
 				if ( prelude == NULL ) {
@@ -208,9 +208,5 @@
 		} // if
 
-		if ( libcfap ) {
-			parse( input, LinkageSpec::Intrinsic );	
-		} else {
-			parse( input, LinkageSpec::Cforall, grammarp );	
-		}
+		parse( input, libcfap ? LinkageSpec::Intrinsic : LinkageSpec::Cforall, grammarp );	
   
 		if ( parsep ) {