[MOAB-dev] r3378 - MOAB/trunk/tools/iMesh

[kraftche at cae.wisc.edu]

Author: kraftche
Date: 2009-11-20 11:58:25 -0600 (Fri, 20 Nov 2009)
New Revision: 3378

Modified:
   MOAB/trunk/tools/iMesh/Makefile.am
   MOAB/trunk/tools/iMesh/iMesh-Defs.inc.in
Log:
remove extra include directory from installed iMesh-Defs.inc

Modified: MOAB/trunk/tools/iMesh/Makefile.am
===================================================================
--- MOAB/trunk/tools/iMesh/Makefile.am	2009-11-20 17:39:29 UTC (rev 3377)
+++ MOAB/trunk/tools/iMesh/Makefile.am	2009-11-20 17:58:25 UTC (rev 3378)
@@ -79,6 +79,7 @@
 install-data-hook:
 	echo "IMESH_DIR=${cfgdir}/.." >> $(DESTDIR)$(cfgdir)/iMesh-SIDL-Defs.inc
 	echo "IMESH_INCLUDEDIR=${includedir}" >> $(DESTDIR)$(cfgdir)/iMesh-Defs.inc
+	echo "IMESH_INCLUDEDIR2=" >> $(DESTDIR)$(cfgdir)/iMesh-Defs.inc
 	echo "IMESH_LIBDIR=${libdir}" >> $(DESTDIR)$(cfgdir)/iMesh-Defs.inc
 	echo "MOAB_LIBDIR=${libdir}" >> $(DESTDIR)$(cfgdir)/iMesh-Defs.inc
 

Modified: MOAB/trunk/tools/iMesh/iMesh-Defs.inc.in
===================================================================
--- MOAB/trunk/tools/iMesh/iMesh-Defs.inc.in	2009-11-20 17:39:29 UTC (rev 3377)
+++ MOAB/trunk/tools/iMesh/iMesh-Defs.inc.in	2009-11-20 17:58:25 UTC (rev 3378)
@@ -9,7 +9,7 @@
 
 IMESH_FCDEFS = @DEFS@
 
-IMESH_INCLUDES = -I$(IMESH_INCLUDEDIR) -I at abs_top_builddir@
+IMESH_INCLUDES = -I$(IMESH_INCLUDEDIR) $(IMESH_INCLUDEDIR2)
 
 IMESH_LIBS = $(IMESH_LDFLAGS) -L$(MOAB_LIBDIR) \
              -L$(IMESH_LIBDIR) -liMesh -lMOAB \
@@ -17,6 +17,7 @@
              $(IMESH_CXX_LDFLAGS) $(IMESH_CXX_LIBS) \
              @CGM_LDFLAGS@ @CGM_LIBS@
 
-IMESH_INCLUDEDIR = @abs_srcdir@
+IMESH_INCLUDEDIR1 = @abs_srcdir@
+IMESH_INCLUDEDIR2 = -I at abs_top_builddir@
 IMESH_LIBDIR = @abs_builddir@/.libs
 MOAB_LIBDIR = @abs_builddir@/../../.libs