---- CHOLMOD/Demo/Makefile.orig 2012-08-28 19:15:59.367085674 +0200
-+++ CHOLMOD/Demo/Makefile 2012-08-28 19:27:39.750404409 +0200
-@@ -16,24 +16,17 @@
- CONFIG = -DNPARTITION
- # check if METIS is requested and available
- ifeq (,$(findstring -DNPARTITION, $(CHOLMOD_CONFIG)))
-- # METIS is requested. See if it is available
-- ifeq ($(METIS_PATH), $(wildcard $(METIS_PATH)))
-- ifeq (../../CAMD, $(wildcard ../../CAMD))
-- ifeq (../../CCOLAMD, $(wildcard ../../CCOLAMD))
-- # METIS, CAMD, and CCOLAMD are 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
-+ # METIS is requested.
-+ ifeq ($(WITH_METIS), 1)
-+ LIB_WITH_PARTITION = -lmetis -lccolamd -lcamd
-+ I_WITH_PARTITION = -I/usr/include/metis \
-+ -I/usr/include/ccolamd -I/usr/include/camd
- CONFIG =
-- endif
+--- CHOLMOD/Demo/Makefile.orig 2013-04-20 07:49:10.121084286 +0200
++++ CHOLMOD/Demo/Makefile 2013-04-20 08:00:24.634389311 +0200
+@@ -14,38 +14,30 @@
+ # CAMD and CCOLAMD can be installed without METIS, but are optional.
+ I_WITH_PARTITION =
+ LIB_WITH_PARTITION =
+-CONFIG = -DNPARTITION -DNCAMD
++CONFIG = -DNPARTITION
+ # check if CAMD/CCOLAMD and METIS are requested and available
+ ifeq (,$(findstring -DNCAMD, $(CHOLMOD_CONFIG)))
+- # CAMD and CCOLAMD are requested. See if they are available
+- ifeq (../../CAMD, $(wildcard ../../CAMD))
+- ifeq (../../CCOLAMD, $(wildcard ../../CCOLAMD))
++ # CAMD and CCOLAMD are requested. Assume they are available
+ # CAMD and CCOLAMD are requested and available
+ LIB_WITH_PARTITION = \
+- ../../CCOLAMD/Lib/libccolamd.a ../../CAMD/Lib/libcamd.a
++ -lccolamd -lcamd
+ I_WITH_PARTITION = \
+- -I../../CCOLAMD/Include -I../../CAMD/Include
++ -I/usr/include/ccolamd -I/usr/include/camd
+ CONFIG = -DNPARTITION
+ # check if METIS is requested and available
+ ifeq (,$(findstring -DNPARTITION, $(CHOLMOD_CONFIG)))
+- # METIS is requested. See if it is available
+- ifeq ($(METIS_PATH), $(wildcard $(METIS_PATH)))
++ # METIS is requested. Assume it is available
+ # 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
++ LIB_WITH_PARTITION = -lmetis -lccolamd -lcamd
++ I_WITH_PARTITION = -I/usr/include/metis \
++ -I/usr/include/ccolamd -I/usr/include/camd
+ CONFIG =
+- endif
+ endif