From e3c7ab13f70ef27acd36cd6cb54d760056cb34f6 Mon Sep 17 00:00:00 2001
From: Salvatore Filippone <salvatore.filippone@cranfield.ac.uk>
Date: Sun, 9 Mar 2008 17:06:26 +0000
Subject: [PATCH] psblas2-dev further fixes to Makefile for lib/include dirs.

---
 Makefile    |  8 ++++----
 Makefile.am | 12 ++++++------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Makefile b/Makefile
index 3421d561..3c51bdcf 100644
--- a/Makefile
+++ b/Makefile
@@ -12,10 +12,10 @@ library:
 	@echo "PSBLAS libraries Compilation Successful."
 
 install:
-	($(INSTALL) -d $(INSTALL_DIR)/lib &&\
-	   $(INSTALL_DATA) lib/*.a  $(INSTALL_DIR)/lib)
-	($(INSTALL) -d $(INSTALL_DIR)/include && \
-	   $(INSTALL_DATA) lib/*$(.mod) $(INSTALL_DIR)/include)
+	($(INSTALL) -d $(INSTALL_LIBDIR) &&\
+	   $(INSTALL_DATA) lib/*.a  $(INSTALL_LIBDIR))
+	($(INSTALL) -d $(INSTALL_INCLUDEDIR) && \
+	   $(INSTALL_DATA) lib/*$(.mod) $(INSTALL_INCLUDEDIR))
 clean: 
 	(cd base; make clean)
 	(cd prec; make clean )
diff --git a/Makefile.am b/Makefile.am
index 2ffe0d79..3c51bdcf 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,6 +3,7 @@ include Make.inc
 all: library 
 
 library:
+	(if test ! -d lib ; then mkdir lib; fi)
 	(cd base; make lib)
 	(cd prec; make lib )
 	(cd krylov; make lib)
@@ -10,12 +11,11 @@ library:
 	@echo "====================================="
 	@echo "PSBLAS libraries Compilation Successful."
 
-
-install: 
-	($(INSTALL) -d $(INSTALL_DIR)/lib &&\
-	   $(INSTALL_DATA) lib/*.a  $(INSTALL_DIR)/lib)
-	($(INSTALL) -d $(INSTALL_DIR)/include && \
-	   $(INSTALL_DATA) lib/*$(.mod) $(INSTALL_DIR)/include)
+install:
+	($(INSTALL) -d $(INSTALL_LIBDIR) &&\
+	   $(INSTALL_DATA) lib/*.a  $(INSTALL_LIBDIR))
+	($(INSTALL) -d $(INSTALL_INCLUDEDIR) && \
+	   $(INSTALL_DATA) lib/*$(.mod) $(INSTALL_INCLUDEDIR))
 clean: 
 	(cd base; make clean)
 	(cd prec; make clean )