f68bba5325351ea77ab3e63e46a773ff5a747b72 hiram Mon Apr 22 11:41:21 2013 -0700 all tests now using binaries from DESTBINDIR, refs #9104 #10630 diff --git src/inc/common.mk src/inc/common.mk index 22ab672..07e3127 100644 --- src/inc/common.mk +++ src/inc/common.mk @@ -157,50 +157,52 @@ SCRIPTS=${HOME}/bin/scripts endif ifeq (${CGI_BIN},) CGI_BIN=/usr/local/apache/cgi-bin endif ifeq (${DOCUMENTROOT},) DOCUMENTROOT=/usr/local/apache/htdocs endif ifeq (${BINDIR},) BINDIR = ${HOME}/bin/${MACHTYPE} endif ifeq (${ENCODE_PIPELINE_BIN},) ENCODE_PIPELINE_BIN=/cluster/data/encode/pipeline/bin endif +DESTBINDIR=${DESTDIR}/${BINDIR} + +# location of stringify program +STRINGIFY = ${DESTBINDIR}/stringify + MKDIR=mkdir -p ifeq (${STRIP},) STRIP=true endif CVS=cvs GIT=git # portable naming of compiled executables: add ".exe" if compiled on # Windows (with cygwin). ifeq (${OS}, Windows_NT) AOUT=a EXE=.exe else AOUT=a.out EXE= endif -# location of stringify program -STRINGIFY = ${DESTDIR}${BINDIR}/stringify - #Lowelab defines #The lowelab specific code will be included in compilation if the following conditions are satistied LOWELAB_WIKI_DEF= LOWELAB_DEF= ifdef LOWELAB LOWELAB_WIKI=1 LOWELAB_DEF=-DLOWELAB endif ifdef LOWELAB_WIKI LOWELAB_WIKI_DEF=-DLOWELAB_WIKI endif LOWELAB_DEFS=${LOWELAB_DEF} ${LOWELAB_WIKI_DEF} ifdef LOWELAB ifeq (${SCRIPTS},/cluster/bin/scripts)