Index: runs.scm
==================================================================
--- runs.scm
+++ runs.scm
@@ -1042,17 +1042,25 @@
 	  (loop (car reg)(cdr reg) '() reruns))
 	 (else
 	  (debug:print-info 4 "Exiting loop with...\n  hed=" hed "\n  tal=" tal "\n  reruns=" reruns))
 	 ))
 	;; now *if* -run-wait we wait for all tests to be done
-      (let loop ((num-running (cdb:remote-run db:get-count-tests-running-for-run-id #f run-id #f)))
+      (let loop ((num-running      (cdb:remote-run db:get-count-tests-running-for-run-id #f run-id #f))
+		 (prev-num-running 0))
 	(if (and (args:get-arg "-run-wait")
 		 (> num-running 0))
 	    (begin
-	      (debug:print-info 0 "-run-wait specified, waiting on " num-running " tests in RUNNING, REMOTEHOSTSTART or LAUNCHED state.")
+	      ;; Here we mark any old defunct tests as incomplete. Do this every fifteen minutes
+	      (if (> (current-seconds)(+ last-time-incomplete 900))
+		  (begin
+		    (debug:print-info 0 "Marking stuck tests as INCOMPLETE while waiting for run " run-id ". Running as pid " (current-process-id) " on " (get-host-name))
+		    (set! last-time-incomplete (current-seconds))
+		    (cdb:remote-run db:find-and-mark-incomplete #f)))
+	      (if (not (eq? num-running prev-num-running))
+		  (debug:print-info 0 "run-wait specified, waiting on " num-running " tests in RUNNING, REMOTEHOSTSTART or LAUNCHED state at " (time->string (seconds->local-time (current-seconds)))))
 	      (thread-sleep! 15)
-	      (loop (cdb:remote-run db:get-count-tests-running-for-run-id #f run-id #f)))))
+	      (loop (cdb:remote-run db:get-count-tests-running-for-run-id #f run-id #f) num-running))))
       ) ;; LET* ((test-record
     ;; we get here on "drop through". All done!
     (debug:print-info 1 "All tests launched")))
 
 (define (runs:calc-fails prereqs-not-met)

Index: utils/Makefile_latest.installall
==================================================================
--- utils/Makefile_latest.installall
+++ utils/Makefile_latest.installall
@@ -50,14 +50,14 @@
 #
 # Derived variables
 #
 
 ifeq ($(PROXY),)
-PROX=
+PROX:=
 else
-http_proxy=http://$(PROXY)
-PROX=-proxy $(PROXY)
+http_proxy:=http://$(PROXY)
+PROX:=-proxy $(PROXY)
 endif
 
 BUILDHOME=$(PWD)
 PATH:=$(PREFIX)/bin:$(PATH)
 LIBPATH=$(PREFIX)/lib$(ADDITIONAL_LIBPATH)