f0a4c801462c1eb13add0002ef0bd045de02e5b7 larrym Tue Aug 30 15:33:31 2011 -0700 remove extra line which contains duplicate file names (presumably from last merge); this caused a make error (see redmine 5140) diff --git src/hg/js/makefile src/hg/js/makefile index e3d7007..bed33e4 100644 --- src/hg/js/makefile +++ src/hg/js/makefile @@ -1,45 +1,44 @@ include ../../inc/common.mk # 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 \ ui.core.js ui.dropdownchecklist.js \ - jquery.autocomplete.js ui.core.js ui.dropdownchecklist.js \ jquery.cookie.js JS_FILES=ajax.js autocomplete.js hgGateway.js hgHubConnect.js hgTracks.js \ hui.js utils.js ddcl.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/${USER}; \ cp ${STATIC_FILES} ${DOCUMENTROOT}-${USER}/js; \ else \ ${MAKE} doInstall DEST=${DOCUMENTROOT}/js/${USER}; \ 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}