32e47282c839f807197b52bf254741724e1be237 markd Fri May 2 18:17:09 2025 -0700 fixed problem with make alpha wanting to put loaders in cgi-bin-alpha diff --git src/inc/cgiVars.mk src/inc/cgiVars.mk index 24ff32c6355..c5ef86e6339 100644 --- src/inc/cgiVars.mk +++ src/inc/cgiVars.mk @@ -1,28 +1,31 @@ # 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}