0f8c686fd4147fa59b8b6cc23cec946748dc1991
markd
  Thu May 1 23:06:25 2025 -0700
addess issues with installing CGI loaders in beta make #35600

diff --git src/makefile src/makefile
index 8071b6a4add..4ebb6bf0be0 100644
--- src/makefile
+++ src/makefile
@@ -1,28 +1,29 @@
 include inc/localEnvironment.mk
 include inc/common.mk
 
 all: utils cgi blatSuite
 
 alpha: check-alpha clean
 	${MAKE} utils-alpha cgi-alpha blatSuite
 
-beta: check-beta clean cgi-beta
+beta: check-beta clean
+	${MAKE} cgi-beta
 
 # do a git update and clean
 update:
-	git pull
+	${GIT} pull
 	${MAKE} clean
 ##
 # topLibs
 ##
 TOP_LIBS = lib parasol/lib htslib
 ifneq ($(wildcard jkOwnLib/*),)
   TOP_LIBS += jkOwnLib
 endif
 topLibs: topChecks | ${TOP_LIBS:%=%.topLibs}
 %.topLibs:
 	${MAKE} -C $*
 
 topChecks:
 	@./checkUmask.sh
 	@MACHTYPE=${MACHTYPE} ./machTest.sh
@@ -57,35 +58,35 @@
 	cd hg && ${MAKE} alpha
 	cd utils/bedToBigBed && ${MAKE} alpha
 
 cgi-beta: check-beta libs logUser
 	cd hg && ${MAKE} beta
 	cd utils/bedToBigBed && ${MAKE} beta
 
 # This log file can be useful when debugging problems on the alpha and beta builds.
 logUser:
 ifeq (${IS_HGWDEV},yes)
 	echo ${USER}, $(MAKECMDGOALS), `date` >> ${CGI_BIN}/buildLog.txt
 endif
 
 check-alpha:
 	# this will fail if we are not on master branch:
-	git branch | egrep '\* master' > /dev/null
+	${GIT} branch | egrep '\* master' > /dev/null
 
 check-beta:
 	# this will fail if we are not in a beta checkout:
-	git branch | egrep '\* v[0-9]+_branch' > /dev/null	
+	${GIT} branch | egrep '\* v[0-9]+_branch' > /dev/null	
 
 BLAT_SUITE_DIRS = blat gfClient gfServer webBlat hg/pslPretty hg/pslReps \
 	hg/pslSort utils/nibFrag utils/faToNib utils/faToTwoBit utils/twoBitToFa \
 	utils/twoBitInfo isPcr blatz
 
 blatSuite: ${BLAT_SUITE_DIRS:%=%.blatSuite}
 
 %.blatSuite: topLibs hgLib
 	 ${MAKE} -C $*
 
 # all of these application makefiles have been updated to include use
 #	of DESTDIR and BINDIR
 
 # common subdirs uses by multiple targets
 STD_DIRS = ameme index dnaDust protDust weblet aladdin primeMate fuse meta tagStorm \