cb7d5985ee3853902cfc19220b6ed85239688394
markd
  Thu Aug 16 21:34:41 2012 -0700
allow overriding CGI_BIN user directory and htdocs in environment
diff --git src/hg/htdocs/makefile src/hg/htdocs/makefile
index 2603194..669e3b8 100644
--- src/hg/htdocs/makefile
+++ src/hg/htdocs/makefile
@@ -1,29 +1,33 @@
 include ../../inc/common.mk
 
 # NOTES:
 #  - much of this is current repeats in the hgdownload htdocs makefile
 #  - all symlinks are built by the doSymLink target
 
 
 GIT = git
 GITUP = ${GIT} pull
 FIND=gitFiles
 
+ifeq (${DOCUMENTROOT_USER},)
+    DOCUMENTROOT_USER=${DOCUMENTROOT}-${USER}
+endif
+
 user:
-	if test -d ${DOCUMENTROOT}-${USER}; then \
-	    ${MAKE} doInstall destDir=${DOCUMENTROOT}-${USER} extra=doSymLink; \
+	if test -d ${DOCUMENTROOT_USER}; then \
+	    ${MAKE} doInstall destDir=${DOCUMENTROOT_USER} extra=doSymLink; \
 	fi
 
 alpha:
 	${MAKE} doInstall destDir=${DOCUMENTROOT} extra=doSymLink
 
 beta:
 	${GITUP}
 	${MAKE} doInstall destDir=${DOCUMENTROOT} extra=doSymLink
 
 alphaCancerPublic:
 	${MAKE} doInstallCancerPublic destDir=${DOCUMENTROOT} extra=doSymLink
 
 alphaCancerSU2C:
 	${MAKE} doInstallCancerSU2C destDir=${DOCUMENTROOT} extra=doSymLink