ee14f8d4faf6533fa7dc494b2c922d51827a35b9
markd
  Fri May 9 13:22:28 2025 -0700
simplify CGI variables

diff --git src/inc/cgiVars.mk src/inc/cgiVars.mk
index c5ef86e6339..6b621be8f05 100644
--- src/inc/cgiVars.mk
+++ src/inc/cgiVars.mk
@@ -1,31 +1,25 @@
 # 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=${DESTDIR}${CGI_BIN}
-ifeq ($(MAKECMDGOALS),)
-    CGI_BIN_DEST=${DESTDIR}${CGI_BIN}-${USER}
-endif
-ifneq ($(filter $(MAKECMDGOALS),my cgi),)
 CGI_BIN_DEST=${DESTDIR}${CGI_BIN}-${USER}
-endif
 ifeq ($(MAKECMDGOALS),alpha)
     CGI_BIN_DEST=${DESTDIR}${CGI_BIN}
 endif
 ifeq ($(MAKECMDGOALS),beta)
     CGI_BIN_DEST=${DESTDIR}${CGI_BIN}-beta
 endif
 
 # set CGI_LOADER_SUBDIR in makefile before this file if you want
 # to install in a sub-directory of cgi-bin/loader
 CGI_LOADER_DEST = ${CGI_BIN_DEST}/loader/${CGI_LOADER_SUBDIR}