3542507725a5bdeceaf09f2e8376bbe5808a6a08 markd Sun Jan 19 13:45:13 2025 -0800 use user cgi-bin for default make diff --git src/inc/cgiVars.mk src/inc/cgiVars.mk index 27a83356284..eed03fc4f39 100644 --- src/inc/cgiVars.mk +++ src/inc/cgiVars.mk @@ -1,26 +1,24 @@ # common variables for CGIs and CGI loader programs ifeq (${CGI_BIN_USER},) CGI_BIN_USER=${CGI_BIN}-${USER} endif ifeq (${CGI_BIN_BETA},) CGI_BIN_BETA=${CGI_BIN}-beta endif # these rules set CGI_BIN_DEST to the right cgi-bin directory depending # on the main goal (my (default), alpha or beta) # this won't work if you supply multiple goals "(make my alpha beta") # but we do not seem to do that CGI_BIN_DEST=${CGI_BIN} -ifeq ($(MAKECMDGOALS),my) +ifeq ($(MAKECMDGOALS),) CGI_BIN_DEST=${CGI_BIN}-${USER} endif -ifeq ($(MAKECMDGOALS),) +ifneq ($(filter $(MAKECMDGOALS),my cgi),) CGI_BIN_DEST=${CGI_BIN}-${USER} endif ifeq ($(MAKECMDGOALS),beta) CGI_BIN_DEST=${CGI_BIN}-beta endif - -