1c002ea441ef48d4580156e0e80f23a8b7dc3eec markd Sun Jan 19 13:05:19 2025 -0800 CGI loaders working diff --git src/inc/cgi_build_rules.mk src/inc/cgi_build_rules.mk index 9c2c2ed269c..4fbea6d2f9d 100644 --- src/inc/cgi_build_rules.mk +++ src/inc/cgi_build_rules.mk @@ -1,39 +1,17 @@ # Common set of build rules for CGI binaries - -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) - CGI_BIN_DEST=${CGI_BIN}-${USER} -endif -ifeq ($(MAKECMDGOALS),) - CGI_BIN_DEST=${CGI_BIN}-${USER} -endif -ifeq ($(MAKECMDGOALS),beta) - CGI_BIN_DEST=${CGI_BIN}-beta -endif +include ${kentSrc}/inc/cgiVars.mk my:: compile chmod a+rx $A${EXE} rm -f ${CGI_BIN_USER}/$A mv $A${EXE} ${CGI_BIN_USER}/$A alpha:: strip rm -f ${CGI_BIN}/$A mv $A${EXE} ${CGI_BIN}/$A beta:: strip rm -f ${CGI_BIN_BETA}/$A mv $A${EXE} ${CGI_BIN_BETA}/$A # don't actually strip so we can get stack traces