FreeCalypso > hg > fc-magnetite

diff components/aci-classic @ 19:88f40f4c829f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
condat2 vs. condat3 includes selection logic
author Mychaela Falconia <falcon@freecalypso.org>
date Wed, 28 Sep 2016 01:37:28 +0000
parents 6323e661f2ed
children 67fe1b3f4bd7
line wrap: on
line diff
--- a/components/aci-classic	Tue Sep 27 21:25:36 2016 +0000
+++ b/components/aci-classic	Wed Sep 28 01:37:28 2016 +0000
@@ -65,9 +65,9 @@
 
 # Includes
 
-CPPFLAGS="$CPPFLAGS -I$SRC/condat2/com/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/inc"
 CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/condat2/com/include"
+CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/include"
 CPPFLAGS="$CPPFLAGS -I../../$CDGINC"
 
 if [ "$MMI" = 2 ]
@@ -452,9 +452,9 @@
 
 # New includes
 
-CPPFLAGS="$CPPFLAGS -I$SRC/condat2/com/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/inc"
 CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/condat2/com/include"
+CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/include"
 CPPFLAGS="$CPPFLAGS -I../../$CDGINC"
 CPPFLAGS="$CPPFLAGS -I$SRC/aci2/aci"
 CPPFLAGS="$CPPFLAGS -I$SRC/aci2/ksd"
@@ -521,9 +521,9 @@
 
 # New includes
 
-CPPFLAGS="$CPPFLAGS -I$SRC/condat2/com/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/inc"
 CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/condat2/com/include"
+CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/include"
 CPPFLAGS="$CPPFLAGS -I../../$CDGINC"
 CPPFLAGS="$CPPFLAGS -I$SRC/aci2/aci"
 CPPFLAGS="$CPPFLAGS -I$SRC/aci2/ati_ext"