bb91983642454f19363543521e36ac836eb504e5
jcasper
  Mon Jun 3 12:59:53 2013 -0700
Collapsed staticDoc.js into one file, updated makefile/README to not clobber alpha on make user, refs #10888
diff --git src/hg/js/makefile src/hg/js/makefile
index e550268..5d74541 100644
--- src/hg/js/makefile
+++ src/hg/js/makefile
@@ -1,59 +1,59 @@
 include ../../inc/common.mk
 
 # recursive target to do install to DEST, with extra excludes EXCL.
 
 JQUERY_FILES=jquery.js jquery.tablednd.js \
     jquery.imgareaselect.js jquery-ui.js jquery.contextmenu.js \
     ui.dropdownchecklist.js \
     jquery.cookie.js jquery.watermarkinput.js \
     jquery.floatheader.js jquery.rotateTableCellContent.js jquery.plugins.js \
     jquery.validate.min.js
     
 JS_FILES=ajax.js alleles.js autocomplete.js edwPersona.js \
     hgCustom.js hgGateway.js hgHubConnect.js hgTracks.js \
     hgVarAnnogrator.js hui.js utils.js ddcl.js subCfg.js \
     encodeProject.js encodeDataSummary.js encodeDataMatrix.js encodeChipMatrix.js encodeMatrix.js \
     ${JQUERY_FILES}
 
 STATIC_FILES=staticDoc.js jquery.js
 
 ifdef LOWELAB
     JS_FILES += lowetooltip.js loweautocomplete.js
 endif
 
 user:
 	if test -d ${DOCUMENTROOT}-${USER}; then \
 	    ${MAKE} doInstall DEST=${DOCUMENTROOT}-${USER}/js; \
 	    ${MAKE} doStaticInstall DEST=${DOCUMENTROOT}-${USER}/js; \
 	else \
 	    ${MAKE} doInstall DEST=${DOCUMENTROOT}/js/${USER}; \
-	    ${MAKE} doStaticInstall DEST=${DOCUMENTROOT}/js/; \
+	    echo "No user version of htdocs directory exists; skipping static files ..."; \
 	fi
 
 alpha:
 	${GITUP}
 	${MAKE} doInstall DEST=${DOCUMENTROOT}/js
 	${MAKE} doStaticInstall DEST=${DOCUMENTROOT}/js
 
 beta:
 	${GITUP} 
 	${MAKE} doInstall DEST=${DOCUMENTROOT}/js
 	${MAKE} doStaticInstall DEST=${DOCUMENTROOT}/js
 
 clean:
 
 compile:
 
 install:
 	${MAKE} doInstall DEST=${DOCUMENTROOT}/js
 	${MAKE} doStaticInstall DEST=${DOCUMENTROOT}/js
 
 doInstall:
 	@mkdir -p ${DEST}/
 	../utils/cpAndLinkToResourceFiles.pl -exclude='makefile' -versionFile=../inc/versionInfo.h -destDir=${DEST} ${JS_FILES}
 
 doStaticInstall:
 	@mkdir -p ${DEST}/
 	for file in ${STATIC_FILES}; do \
 	    cp -p --update $$file ${DEST}; \
 	done