c7902c86e8cd41cece250ccf5c91af415310248c
jcasper
Mon Jun 10 10:18:04 2013 -0700
Revised makefile to not print a warning when placing files in js/{user}, due to developer request
diff --git src/hg/js/makefile src/hg/js/makefile
index 1ed7d23..ef48538 100644
--- src/hg/js/makefile
+++ src/hg/js/makefile
@@ -1,52 +1,51 @@
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; \
else \
${MAKE} doInstall DEST=${DOCUMENTROOT}/js/${USER}; \
- echo "Warning: No user version of htdocs directory exists; static docs will ignore these files ..."; \
fi
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}/
../utils/cpAndLinkToResourceFiles.pl -exclude='makefile' -versionFile=../inc/versionInfo.h -destDir=${DEST} ${JS_FILES}
for file in ${STATIC_FILES}; do \
cp -p --update $$file ${DEST}; \
done