6381d8491bbc3c33a7fbfb11fe2a0d8c56c4b06d galt Sun Jun 13 14:57:13 2010 -0700 tweaking git pull to be safer diff --git src/hg/js/makefile src/hg/js/makefile index a8ba2dc..7ed85f2 100644 --- src/hg/js/makefile +++ src/hg/js/makefile @@ -1,33 +1,33 @@ include ../../inc/common.mk -GITUP = git pull origin master +GITUP = git pull -q # recursive target to do install to DEST, with extra excludes EXCL. JQUERY_FILES=jquery-1.2.6.pack.js jquery.js jquery.tablednd.js jquery.imgareaselect.js jquery-ui.js jquery.contextmenu.js jquery.autocomplete.js ui.core.js ui.dropdownchecklist.js JS_FILES=ajax.js autocomplete.js hgGateway.js hgTracks.js hui.js utils.js ${JQUERY_FILES} ifdef LOWELAB JS_FILES += lowetooltip.js loweautocomplete.js endif user: ${MAKE} doInstall DEST=${DOCUMENTROOT}/js/${USER} alpha: ${GITUP} ${MAKE} doInstall DEST=${DOCUMENTROOT}/js beta: ${GITUP} ${MAKE} doInstall DEST=${DOCUMENTROOT}/js clean: compile: install: ${MAKE} doInstall DEST=${DOCUMENTROOT}/js doInstall: @mkdir -p ${DEST}/ ./cpJsFiles.pl -exclude='makefile' -destDir=${DEST} ${JS_FILES}