[MOAB-dev] r3643 - MOAB/trunk

[kraftche at cae.wisc.edu]

Author: kraftche
Date: 2010-03-17 11:17:11 -0500 (Wed, 17 Mar 2010)
New Revision: 3643

Modified:
   MOAB/trunk/Makefile.am
   MOAB/trunk/moab.make.in
Log:
fix include paths in moab.make when used for non-installed moab

Modified: MOAB/trunk/Makefile.am
===================================================================
--- MOAB/trunk/Makefile.am	2010-03-17 16:00:46 UTC (rev 3642)
+++ MOAB/trunk/Makefile.am	2010-03-17 16:17:11 UTC (rev 3643)
@@ -38,7 +38,7 @@
 # directory until we're doing the install.
 install-data-hook:
 	echo "MOAB_LIBDIR=${libdir}" >> $(DESTDIR)$(cfgdir)/moab.make
-	echo "MOAB_INCLUDEDIR=${includedir}" >> $(DESTDIR)$(cfgdir)/moab.make
+	echo "MOAB_INCLUDES=-I${includedir}" >> $(DESTDIR)$(cfgdir)/moab.make
 
 
 # Generate a file to be installed in $libdir containing the configuration

Modified: MOAB/trunk/moab.make.in
===================================================================
--- MOAB/trunk/moab.make.in	2010-03-17 16:00:46 UTC (rev 3642)
+++ MOAB/trunk/moab.make.in	2010-03-17 16:17:11 UTC (rev 3643)
@@ -1,10 +1,19 @@
+# The values below are for an un-installed copy of MOAB used directly
+# from its build build directory.  These values will be overridden below
+# for installed copies of MOAB.
 MOAB_LIBDIR = @abs_builddir@/src/.libs
-MOAB_INCLUDEDIR = @abs_srcdir/src@ -I at abs_builddir/src@
+MOAB_INCLUDES = -I at abs_srcdir@/src \
+                -I at abs_builddir@/src \
+                -I at abs_srcdir@/oldinc \
+                -I at abs_srcdir@/parallel \
+                -I at abs_builddir@/parallel
 
 MOAB_CXXFLAGS = @CXXFLAGS@ @AM_CXXFLAGS@
 MOAB_CFLAGS = @CFLAGS@ @AM_CFLAGS@
 MOAB_LDFLAGS = @EXPORT_LDFLAGS@
 
-MOAB_INCLUDES = -I$(MOAB_INCLUDEDIR)
+MOAB_LIBS_LINK = ${MOAB_LDFLAGS} -L${MOAB_LIBDIR} -lMOAB @LIBS@ @CGM_LIBS@ @NETCDF_LIBS@ @HDF5_LIBS@
 
-MOAB_LIBS_LINK = ${MOAB_LDFLAGS} -L${MOAB_LIBDIR} -lMOAB @LIBS@ @CGM_LIBS@ @NETCDF_LIBS@ @HDF5_LIBS@
+# Override MOAB_LIBDIR and MOAB_INCLUDES from above with the correct
+# values for the installed MOAB.
+