- updated to 5.5.0

[packages/UMFPACK.git] / UMFPACK-ufconfig.patch

diff -ur UMFPACK/Demo/Makefile UMFPACK-uf/Demo/Makefile
--- UMFPACK/Demo/Makefile	2007-05-05 21:56:55.000000000 +0200
+++ UMFPACK-uf/Demo/Makefile	2007-12-02 19:18:50.000000000 +0100
@@ -7,12 +7,11 @@
 
 default: libs run
 
-include ../../UFconfig/UFconfig.mk
+include /usr/share/misc/UFconfig.mk
 
-C = $(CC) $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../../AMD/Include \
-    -I../../UFconfig
+C = $(CC) $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I/usr/include/amd
 
-INC = ../Include/umfpack.h ../../AMD/Include/amd.h ../../UFconfig/UFconfig.h
+INC = ../Include/umfpack.h ../../AMD/Include/amd.h
 
 LIBS = $(BLAS) $(XERBLA) $(LIB)
 
diff -ur UMFPACK/Doc/Makefile UMFPACK-uf/Doc/Makefile
--- UMFPACK/Doc/Makefile	2006-01-30 17:51:24.000000000 +0100
+++ UMFPACK-uf/Doc/Makefile	2007-12-02 19:19:00.000000000 +0100
@@ -7,7 +7,7 @@
 
 default: dist
 
-include ../../UFconfig/UFconfig.mk
+include /usr/share/misc/UFconfig.mk
 
 #-------------------------------------------------------------------------------
 # Remove all but the files in the original distribution
--- UMFPACK/Lib/GNUmakefile.orig	2009-11-11 21:09:54.000000000 +0100
+++ UMFPACK/Lib/GNUmakefile	2010-10-13 19:56:54.827741882 +0200
@@ -4,12 +4,10 @@
 
 default: libumfpack.a
 
-include ../../UFconfig/UFconfig.mk
+include /usr/share/misc/UFconfig.mk
 
 C = $(CC) $(CFLAGS) $(UMFPACK_CONFIG) \
-    -I../Include -I../Source -I../../AMD/Include -I../../UFconfig \
-    -I../../CCOLAMD/Include -I../../CAMD/Include -I../../CHOLMOD/Include \
-    -I../../metis-4.0/Lib -I../../COLAMD/Include
+    -I../Include -I../Source -I/usr/include/amd -I/usr/include/cholmod
 
 #-------------------------------------------------------------------------------
 # source files
@@ -67,7 +65,7 @@
 # include files:
 #-------------------------------------------------------------------------------
 
-INC = ../Include/umfpack.h ../../UFconfig/UFconfig.h \
+INC = ../Include/umfpack.h \
 	../Source/umf_config.h ../Source/umf_version.h \
 	../Source/umf_internal.h ../Source/umf_triplet.h \
 	$(addprefix ../Source/,  $(addsuffix .h,$(UMFCH))) \
diff -ur UMFPACK/Lib/Makefile UMFPACK-uf/Lib/Makefile
--- UMFPACK/Lib/Makefile	2007-05-05 21:50:23.000000000 +0200
+++ UMFPACK-uf/Lib/Makefile	2007-12-02 19:19:20.000000000 +0100
@@ -8,7 +8,7 @@
 
 default: everything
 
-include ../../UFconfig/UFconfig.mk
+include /usr/share/misc/UFconfig.mk
 
 C = $(CC) $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../../AMD/Include \
     -I../Source
diff -ur UMFPACK/Makefile UMFPACK-uf/Makefile
--- UMFPACK/Makefile	2007-10-30 23:03:55.000000000 +0100
+++ UMFPACK-uf/Makefile	2007-12-02 19:21:14.000000000 +0100
@@ -6,7 +6,7 @@
 
 default: library
 
-include ../UFconfig/UFconfig.mk
+include /usr/share/misc/UFconfig.mk
 
 # compile all C code (except hb, fortran, and fortran64), including AMD and the
 # MATLAB mexFunctions
--- UMFPACK/MATLAB/Makefile.orig	2009-11-11 21:10:02.000000000 +0100
+++ UMFPACK/MATLAB/Makefile	2010-10-13 09:39:55.187740205 +0200
@@ -5,7 +5,7 @@
 default:
 	- echo "Use umfpack_make.m in MATLAB to compile the UMFPACK mexFunction"
 
-include ../../UFconfig/UFconfig.mk
+include /usr/share/misc/UFconfig.mk
 
 #-------------------------------------------------------------------------------
 # Remove all but the files in the original distribution
diff -ur UMFPACK/Tcov/Makefile UMFPACK-uf/Tcov/Makefile
--- UMFPACK/Tcov/Makefile	2006-12-01 13:47:48.000000000 +0100
+++ UMFPACK-uf/Tcov/Makefile	2007-12-02 19:21:03.000000000 +0100
@@ -1,5 +1,5 @@
 
-include ../../UFconfig/UFconfig.mk
+include /usr/share/misc/UFconfig.mk
 
 linux: distclean
 	./DO.linux