599313ad7752f3917a709f3f74f82111f5f44e4d
max
  Thu Mar 19 04:50:54 2015 -0700
fixing merge conflict

diff --git src/hg/hgBeacon/makefile src/hg/hgBeacon/makefile
index 6c3e3f2..884f99d 100644
--- src/hg/hgBeacon/makefile
+++ src/hg/hgBeacon/makefile
@@ -1,39 +1,40 @@
 include ../../inc/common.mk
 
 #cannot use common include rules, don't know how to overwrite :: targets
 #include ../../inc/cgi_build_rules.mk
 
 ifeq (${CGI_BIN_USER},)
     CGI_BIN_USER=${CGI_BIN}-${USER}
 endif
 
 ifeq (${CGI_BIN_BETA},)
     CGI_BIN_BETA=${CGI_BIN}-beta
 endif
 
 PATH:=$(PATH):/cluster/software/bin
 
 my::
 	rm -f ${CGI_BIN_USER}/hgBeacon
 	cp -p hgBeacon ${CGI_BIN_USER}/
 	mkdir -p ${CGI_BIN_USER}/beacon2
 	ln -sf ${CGI_BIN_USER}/hgBeacon ${CGI_BIN_USER}/beacon2/info
 	ln -sf ${CGI_BIN_USER}/hgBeacon ${CGI_BIN_USER}/beacon2/query
-	@if test -d /gbdb/hg19/beacon; then \
-	  cp help.txt /gbdb/hg19/beacon/; \
-	fi
-	cp testBeacon ${DESTDIR}${BINDIR}/
+help:
+	cp help.txt /gbdb/hg19/beacon/
+
 beta::
 	rm -f ${CGI_BIN_BETA}/hgBeacon
 	cp -p hgBeacon ${CGI_BIN_BETA}/
+
 alpha::
 	rm -f ${CGI_BIN}/hgBeacon
 	cp -p hgBeacon ${CGI_BIN}/
+	cp testBeacon ${DESTBINDIR}/
 lint:
 	pylint -E --rcfile=pylint.rc hgBeacon
 clean::
 
 compile::
 
 install::