[cgma-dev] r3312 - cgm/trunk/itaps

[jvporter at wisc.edu]

Author: jvporter
Date: 2009-11-09 15:33:55 -0600 (Mon, 09 Nov 2009)
New Revision: 3312

Modified:
   cgm/trunk/itaps/Makefile.am
   cgm/trunk/itaps/iGeom-Defs.inc.in
Log:
Add IGEOM_INCLUDEDIR to iGeom-Defs.inc


Modified: cgm/trunk/itaps/Makefile.am
===================================================================
--- cgm/trunk/itaps/Makefile.am	2009-11-09 20:54:21 UTC (rev 3311)
+++ cgm/trunk/itaps/Makefile.am	2009-11-09 21:33:55 UTC (rev 3312)
@@ -97,7 +97,7 @@
 install-data-hook:
 	echo "IGEOM_CXX_LDFLAGS = -L${libdir}" >> $(CFG_FILE)
 	echo "IGEOM_CXX_LTFLAGS = -R${libdir}" >> $(CFG_FILE)
-	echo "IGEOM_INCLUDES = -I${includedir}" >> $(CFG_FILE)
+	echo "IGEOM_INCLUDEDIR = ${includedir}" >> $(CFG_FILE)
 
 EXTRA_DIST = testgeom.sat size.sat
 

Modified: cgm/trunk/itaps/iGeom-Defs.inc.in
===================================================================
--- cgm/trunk/itaps/iGeom-Defs.inc.in	2009-11-09 20:54:21 UTC (rev 3311)
+++ cgm/trunk/itaps/iGeom-Defs.inc.in	2009-11-09 21:33:55 UTC (rev 3312)
@@ -3,7 +3,7 @@
 IGEOM_FCDEFS = @DEFS@
 
 # These should never be required for the iGeom interface
-IGEOM_INCLUDES = -I at abs_srcdir@ -I at abs_builddir@
+IGEOM_INCLUDES = -I$(IGEOM_INCLUDEDIR)
 IGEOM_DEFINES = @HAVE_ACIS_DEF@ @HAVE_OCC_DEF@
 IGEOM_CPPFLAGS = $(IGEOM_DEFINES) $(IGEOM_INCLUDES)
 
@@ -16,4 +16,5 @@
 IGEOM_CXX_LDFLAGS = -L at abs_top_builddir@/.libs -L at abs_builddir@/.libs
 IGEOM_CXX_LTFLAGS = -R at abs_top_builddir@/.libs -R at abs_builddir@/.libs
 
+IGEOM_INCLUDEDIR = @abs_srcdir@
 # Below here goes the overrides that happen during installation