5a2f8c4e6e3e58be64f265b0ee05ac860969645a angie Wed Aug 21 14:17:56 2013 -0700 Tweaked phyloGif/makefile's installation to tolerate the use of the samedirectory for CGI binaries and utils. diff --git src/hg/phyloGif/makefile src/hg/phyloGif/makefile index d049d11..5a6a64f 100644 --- src/hg/phyloGif/makefile +++ src/hg/phyloGif/makefile @@ -1,29 +1,29 @@ include ../../inc/common.mk L += $(MYSQLLIBS) -lm MYLIBDIR = ../../lib/${MACHTYPE} MYLIBS = $(MYLIBDIR)/jkhgap.a $(MYLIBDIR)/jkweb.a A = phyloGif O = ${A}.o include ../../inc/cgi_build_rules.mk my:: compile - if [ -d "${BINDIR}" ]; then \ + if [ -d "${BINDIR}" ] && [ ! ${CGI_BIN}-${USER}/$A -ef ${DESTDIR}${BINDIR}/$A ] ; then \ cp ${CGI_BIN}-${USER}/$A ${DESTDIR}${BINDIR}/; \ fi compile: $O ${CC} $O ${MYLIBS} ${L} mv ${AOUT} $A${EXE} chmod a+rx $A${EXE} test: compile ${DESTDIR}${BINDIR}/phyloGif -phyloGif_tree=17way.nh > test.gif file test.gif testWeb: compile wget -O testWeb.gif 'http://hgwdev.cse.ucsc.edu/cgi-bin/phyloGif?phyloGif_tree=(A:0.1,B:0.1);' file testWeb.gif