fix default prefix handling in makefiles

PREFIX wasn't communicated to Makefile.install (where it matters)
by Makefile. The result is that the default PREFIX is empty and
OpenBLAS was being installed in /lib.
This commit is contained in:
Lars Buitinck 2013-08-28 17:39:54 +02:00
parent fe98de2f68
commit a29e6592da
2 changed files with 2 additions and 4 deletions

View File

@ -15,10 +15,6 @@ ifdef SANITY_CHECK
BLASDIRS += reference BLASDIRS += reference
endif endif
ifndef PREFIX
PREFIX = /opt/OpenBLAS
endif
SUBDIRS = $(BLASDIRS) SUBDIRS = $(BLASDIRS)
ifneq ($(NO_LAPACK), 1) ifneq ($(NO_LAPACK), 1)
SUBDIRS += lapack SUBDIRS += lapack

View File

@ -3,6 +3,8 @@ export GOTOBLAS_MAKEFILE = 1
-include $(TOPDIR)/Makefile.conf_last -include $(TOPDIR)/Makefile.conf_last
include ./Makefile.system include ./Makefile.system
PREFIX?=/opt/OpenBLAS
OPENBLAS_INCLUDE_DIR:=$(PREFIX)/include OPENBLAS_INCLUDE_DIR:=$(PREFIX)/include
OPENBLAS_LIBRARY_DIR:=$(PREFIX)/lib OPENBLAS_LIBRARY_DIR:=$(PREFIX)/lib
OPENBLAS_BUILD_DIR:=$(CURDIR) OPENBLAS_BUILD_DIR:=$(CURDIR)