diff --git a/Makefile b/Makefile
index 7bd8a450e..82c09d058 100644
--- a/Makefile
+++ b/Makefile
@@ -27,13 +27,17 @@ CXXFLAGS = -Wall -Wextra -ggdb -I"$(shell pwd)" -I${DESTDIR}/include -MD -D_YOSY
 LDFLAGS = -I${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
@@ -142,7 +146,7 @@ yosys-config: yosys-config.in
 
 yosys-svgviewer: libs/svgviewer/*.h libs/svgviewer/*.cpp
 	cd libs/svgviewer && $(QMAKE) && make
-	cp libs/svgviewer/svgviewer yosys-svgviewer
+	cp `find libs/svgviewer -name svgviewer -type f` yosys-svgviewer
 
 yosys-minisat: $(DESTDIR)/bin/minisat
 $(DESTDIR)/bin/minisat:
@@ -172,7 +176,7 @@ endif
 yosys-abc: abc/abc-$(ABCREV)
 	cp abc/abc-$(ABCREV) yosys-abc
 
-test: yosys
+test: $(TARGETS) $(EXTRA_TARGETS)
 	cd tests/simple && bash run-test.sh
 	cd tests/hana && bash run-test.sh
 	cd tests/asicworld && bash run-test.sh