58e25c03395494013032de03317630e411f43bb9 braney Mon Mar 28 14:58:35 2011 -0700 fix up makefiles to grok DESTDIR, add blat,gfServer, and gfClient to userApps #3152 diff --git src/gfServer/makefile src/gfServer/makefile index 97ee709..da5bcef 100644 --- src/gfServer/makefile +++ src/gfServer/makefile @@ -1,27 +1,27 @@ include ../inc/common.mk L += -lm $(SOCKETLIB) MYLIBDIR = ../lib/$(MACHTYPE) MYLIBS = $(MYLIBDIR)/jkOwnLib.a $(MYLIBDIR)/jkweb.a O = gfServer.o X = gfServer gfServer: $O $(MYLIBS) - ${CC} ${COPT} ${CFLAGS} -o ${BINDIR}/$X $O $(MYLIBS) $L - ${STRIP} ${BINDIR}/$X${EXE} + ${CC} ${COPT} ${CFLAGS} -o ${DESTDIR}${BINDIR}/$X $O $(MYLIBS) $L + ${STRIP} ${DESTDIR}${BINDIR}/$X${EXE} test: ${MKDIR} tests/output $X direct tests/input/mCrea.mrna tests/input/hCreaGeno.nib \ tests/input/mCreaGeno.nib > tests/output/testNib $X direct tests/input/mCrea.mrna tests/input/creaGeno.2bit \ >tests/output/testTwoBit cd tests && ./testProtNib output/testProtNib cd tests && ./testProtTwoBit output/testProtTwoBit cd tests && ./testTransNib output/testTransNib cd tests && ./testTransTwoBit output/testTransTwoBit cd tests && ./testPcr output/testPcr diff -r -x CVS tests/expected tests/output rm -r tests/output