fbc8d393d023d018b71322e8717a8079d80c2d3c
Merge parents 0ba17462c2e 8bd8d6c944f
maximilianh
  Sat Apr 26 00:38:02 2025 +0200
trying to fix mysterious merge conflict, as I didnt touch this file at all

diff --cc src/inc/cgiLoader.mk
index 807144e0f22,07f0a3aaa31..b8ed3f1aef4
--- src/inc/cgiLoader.mk
+++ src/inc/cgiLoader.mk
@@@ -1,28 -1,30 +1,29 @@@
  ########################################################################
  # make rules for programs that CGI loaders.
  #
  # These are all userApps as well and this includes userApps.mk
  #
  #	kentSrc = ../..
  #	A = aveCols
  #	include ${kentSrc}/inc/cgiLoader.mk
  #
  ########################################################################
  
  include ${kentSrc}/inc/userApp.mk
  include ${kentSrc}/inc/cgiVars.mk
  
+ 
  # this target uses CGI_BIN_DEST set in cgiVars.mk to do any of the CGI targers
- cgi_any:: compile
+ cgi_any:: compile ${SQL_FILES:%=%_sql_install}
  	chmod a+rx ${A}${EXE}
- 	${MKDIR} ${CGI_BIN_DEST}/loader
+ 	${MKDIR} ${CGI_LOADER_DEST}
  	chmod a+rx ${A}${EXE}
- 	mv -f ${A}${EXE} ${CGI_BIN_DEST}/loader/
- 	for F in ${SQL_FILES}; do \
- 	    B=`basename $$F` ; \
- 	    cp -fp ${CPREMDESTOPT} $$F ${CGI_BIN_DEST}/loader/$$B ; \
- 	done
+ 	mv -f ${A}${EXE} ${CGI_LOADER_DEST}/
+ 
 -
+ %_sql_install:
+ 	@${MKDIR} ${CGI_LOADER_DEST}
+ 	cp -fp --remove-destination $* ${CGI_LOADER_DEST}/
  
  cgi:: cgi_any
  alpha:: cgi_any
  beta:: cgi_any