b275bed5b8219c6f88a98602a5e82d1655166415 markd Sun Oct 3 13:42:11 2021 -0700 fixed rule that copies phyloPng to a BINDIR to take from the correct CGI dir diff --git src/hg/phyloPng/makefile src/hg/phyloPng/makefile index d01508a..e649de1 100644 --- src/hg/phyloPng/makefile +++ src/hg/phyloPng/makefile @@ -2,32 +2,32 @@ include ../../inc/common.mk L += $(MYSQLLIBS) -lm MYLIBDIR = ../../lib/${MACHTYPE} MYLIBS = $(MYLIBDIR)/jkhgap.a $(MYLIBDIR)/jkweb.a A = phyloPng O = ${A}.o include ../../inc/cgi_build_rules.mk # phyloPng is both a utilitiy that can be run from the commandline, and a CGI. my:: compile - if [ -d "${BINDIR}" ] && [ ! ${CGI_BIN}-${USER}/$A -ef ${DESTDIR}${BINDIR}/$A ] ; then \ - cp ${CGI_BIN}-${USER}/$A ${DESTDIR}${BINDIR}/; \ + if [ -d "${BINDIR}" ] && [ ! ${CGI_BIN_DEST}/$A -ef ${DESTDIR}${BINDIR}/$A ] ; then \ + cp ${CGI_BIN_DEST}/$A ${DESTDIR}${BINDIR}/; \ fi compile: $O ${CC} $O ${MYLIBS} ${L} mv ${AOUT} $A${EXE} chmod a+rx $A${EXE} test: compile ${DESTDIR}${BINDIR}/phyloPng -phyloPng_tree=17way.nh > test.png file test.png testWeb: compile wget -O testWeb.png 'http://hgwdev.soe.ucsc.edu/cgi-bin/phyloPng?phyloPng_tree=(A:0.1,B:0.1);' file testWeb.png