casa-mp-base

--- CHOLMOD/Lib/Makefile.orig   2013-10-24 11:40:26.000000000 -0400

+++ CHOLMOD/Lib/Makefile    2013-10-24 12:18:47.000000000 -0400

@@ -22,8 +22,7 @@

             # CAMD and CCOLAMD are requested and available

             LIB_WITH_PARTITION = \

                         ../../CCOLAMD/Lib/libccolamd.a ../../CAMD/Lib/libcamd.a

-            I_WITH_PARTITION = \

-                        -I../../CCOLAMD/Include -I../../CAMD/Include

+            I_WITH_PARTITION =

             CONFIG = -DNPARTITION

             # check if METIS is requested and available

             ifeq (,$(findstring -DNPARTITION, $(CHOLMOD_CONFIG)))

@@ -32,8 +31,7 @@

                     # METIS is available

                     LIB_WITH_PARTITION = $(METIS) \

                         ../../CCOLAMD/Lib/libccolamd.a ../../CAMD/Lib/libcamd.a

-                    I_WITH_PARTITION = -I$(METIS_PATH)/Lib \

-                        -I../../CCOLAMD/Include -I../../CAMD/Include

+                    I_WITH_PARTITION = -I$(METIS_PATH)/include

                     CONFIG =

                 endif

             endif

@@ -44,7 +42,8 @@

 #-------------------------------------------------------------------------------

 I = -I../../AMD/Include -I../../AMD/Source -I../../COLAMD/Include \

-   $(I_WITH_PARTITION) -I../Include -I../../SuiteSparse_config

+   -I../Include -I../../SuiteSparse_config \

+   -I../../CCOLAMD/Include -I../../CAMD/Include $(I_WITH_PARTITION)

 #-------------------------------------------------------------------------------