324c1151dbc0092a3960c64add9213743afc66d6 jcasper Wed Jul 13 12:07:09 2016 -0700 Initial stab at having htdocs makefile also run pandoc, refs #14399 diff --git src/hg/htdocs/makefile src/hg/htdocs/makefile index d867dcb..be9db7f 100644 --- src/hg/htdocs/makefile +++ src/hg/htdocs/makefile @@ -31,22 +31,23 @@ ${MAKE} doInstall destDir=${DOCUMENTROOT} beta: ${GITUP} ${MAKE} doInstall destDir=qateam@hgwbeta:${DOCUMENTROOT} ${MAKE} doInstall destDir=${DOCUMENTROOT}-beta # Run rsync. Care is taking to preserve times and mode on files. rsync is # smart about recreating file under the current users so that times and # permissions maybe 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} + cd pandoc/installer && ${MAKE} doInstall destDir=${destDir} # Other targets that may be invoked by ../makefile: compile: install: alpha clean: