- Makefile: export PATH=${DESTDIR}/bin:$(PATH) and (DY)LD_LIBRARY_PATH, to make...

 - 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 035f7c5a487fe731334802eb0974565bce60e819..39b324b4d421458779375c0b0a687a122ed087c4 100644 (file)
--- 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