7217046cf722b61ac43df8be26b465f2d2dbb21d hiram Wed Apr 10 16:30:19 2013 -0700 correctly using DESTDIR with BINDIR refs #9104 diff --git src/blatz/makefile src/blatz/makefile index e8dfa04..f45fe4d 100644 --- src/blatz/makefile +++ src/blatz/makefile @@ -1,33 +1,33 @@ include ../inc/common.mk L += -lm $(SOCKETLIB) MYLIBDIR = ../lib/${MACHTYPE} MYLIBS = ${MYLIBDIR}/jkOwnLib.a ${MYLIBDIR}/jkweb.a O = align.o bzp.o gapless.o index.o output.o all: blatz blatzClient blatzServer echo made blatz: standalone.o $O ${MYLIBS} - ${CC} ${COPT} -o ${BINDIR}/blatz standalone.o $O ${MYLIBS} $L -# ${STRIP} ${BINDIR}/blatz${EXE} + ${CC} ${COPT} -o ${DESTDIR}${BINDIR}/blatz standalone.o $O ${MYLIBS} $L +# ${STRIP} ${DESTDIR}${BINDIR}/blatz${EXE} blatzServer: server.o $O ${MYLIBS} - ${CC} ${COPT} -o ${BINDIR}/blatzServer server.o $O ${MYLIBS} $L - ${STRIP} ${BINDIR}/blatzServer${EXE} + ${CC} ${COPT} -o ${DESTDIR}${BINDIR}/blatzServer server.o $O ${MYLIBS} $L + ${STRIP} ${DESTDIR}${BINDIR}/blatzServer${EXE} blatzClient: client.o bzp.o ${MYLIBS} - ${CC} ${COPT} -o ${BINDIR}/blatzClient client.o bzp.o ${MYLIBS} $L - ${STRIP} ${BINDIR}/blatzClient${EXE} + ${CC} ${COPT} -o ${DESTDIR}${BINDIR}/blatzClient client.o bzp.o ${MYLIBS} $L + ${STRIP} ${DESTDIR}${BINDIR}/blatzClient${EXE} clean: rm -f $O standalone.o server.o client.o test: doTest doTest: blatz test/clock/human.fa test/clock/mouse.fa test/clock/test.chain diff test/clock/expected.chain test/clock/test.chain blatz test/100k/human.fa test/100k/mouse.fa test/100k/test.chain diff test/100k/expected.chain test/100k/test.chain