284b199b7b48ccea38ce21225898bfaf7172a7cd chmalee Mon Aug 1 11:07:17 2016 -0700 Removing pandoc dependency from htdocs makefile, no refs diff --git src/hg/htdocs/makefile src/hg/htdocs/makefile index 14ef4bb..560ef22 100644 --- src/hg/htdocs/makefile +++ src/hg/htdocs/makefile @@ -13,42 +13,39 @@ # but be careful as it will rsync everything over including junk # REMEMBER: HTDOCSEXTRA # htdocsExtra is a repository that contains large files that we # do not wish to burden the main kent repo with. # You can check it out and make there too. # If you think there is a file missing, see if it is under the htdocsExtra repo. ifeq (${DOCUMENTROOT_USER},) DOCUMENTROOT_USER=${DOCUMENTROOT}-${USER} endif user: if test -d ${DOCUMENTROOT_USER}; then \ ${MAKE} doInstall destDir=${DOCUMENTROOT_USER} ; \ - cd pandoc/installer && ${MAKE} user ; \ fi alpha: ${MAKE} doInstall destDir=${DOCUMENTROOT} - cd pandoc/installer && ${MAKE} alpha beta: ${GITUP} ${MAKE} doInstall destDir=qateam@hgwbeta:${DOCUMENTROOT} ${MAKE} doInstall destDir=${DOCUMENTROOT}-beta - cd pandoc/installer && ${MAKE} beta # Run rsync. Care is taken to preserve times and modes on files. rsync is # smart about recreating files under the current users so that times and # permissions may be modified. However, problems happen when a directory # is not owned by the current users. These options attemp to work around it. # use care in changing rsyncOpts = --times --recursive --omit-dir-times --relative --cvs-exclude --exclude='makefile' --exclude='cpAndLinkToResourceFiles.pl' --exclude='style/*' doInstall: umask 002; rsync ${rsyncOpts} ${excl} ${incl} `$(FIND)` ${destDir} # Other targets that may be invoked by ../makefile: compile: install: alpha