From: Siesh1oo <siesh1oo@siesh1oo.no>
Date: Mon, 10 Mar 2014 19:06:46 +0000 (+0100)
Subject:  - Makefile: export PATH=${DESTDIR}/bin:$(PATH) and (DY)LD_LIBRARY_PATH, to make... 
X-Git-Tag: yosys-0.3.0~57^2~5
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=1d0abb3ad2a85188eef6201e0a32acbcec1e78b3;p=yosys.git

 - Makefile: export PATH=${DESTDIR}/bin:$(PATH) and (DY)LD_LIBRARY_PATH, to make sure our local copies of built executables and libraries are used.
 - Makefile: use find expression in target 'yosys-svgviewer' to find svgviewer binary (qmake will build into .app package on OSX).
 - Makefile: make 'test' target dependent on $(TARGETS) and $(EXTRA_TARGETS) to make sure that minisat is built.
---

diff --git a/Makefile b/Makefile
index 035f7c5a4..39b324b4d 100644
--- a/Makefile
+++ b/Makefile
@@ -26,13 +26,17 @@ CXXFLAGS = -Wall -Wextra -ggdb -I"$(shell pwd)" -I${DESTDIR}/include -MD -D_YOSY
 LDFLAGS = -L${DESTDIR}/lib
 LDLIBS = -lstdc++ -lreadline -lm -ldl
 
+export PATH := ${DESTDIR}/bin:$(PATH)
+
 ifeq (Darwin,$(findstring Darwin,$(shell uname)))
 	# add macports include and library path to search directories, don't use '-rdynamic' and '-lrt':
+	export DYLD_LIBRARY_PATH := ${DESTDIR}/lib:$(DYLD_LIBRARY_PATH)
 	CXXFLAGS += -I/opt/local/include
 	LDFLAGS += -L/opt/local/lib
 	QMAKE = qmake
 	SED = gsed
 else
+	export LD_LIBRARY_PATH := ${DESTDIR}/lib:$(LD_LIBRARY_PATH)
 	LDFLAGS += -rdynamic
 	LDLIBS += -lrt
 	QMAKE = qmake-qt4