Merge remote-tracking branch 'upstream/master'

Conflicts: test/serial/Makefile
7 years ago · aa8594a8a2
parent 05c5dead88 110e053991
commit aa8594a8a2
1 changed files with 4 additions and 4 deletions
--- a/test/serial/Makefile
+++ b/test/serial/Makefile
@ -1,11 +1,11 @@
 #
 # Libraries used
 #
-BASEDIR=../..
-INCDIR=$(BASEDIR)/include/
-MODDIR=$(BASEDIR)/modules/
+INSTALLDIR=../..
+INCDIR=$(INSTALLDIR)/include/
+MODDIR=$(INSTALLDIR)/modules/
 include $(INCDIR)/Make.inc.psblas
-LIBDIR=$(BASEDIR)/lib/
+LIBDIR=$(INSTALLDIR)/lib/
 PSBLAS_LIB= -L$(LIBDIR) -lpsb_util -lpsb_krylov -lpsb_prec -lpsb_base
 LDLIBS=$(PSBLDLIBS)