Project

General

Profile

« Previous | Next » 

Revision 10065

bugfix: lib/sh/make.sh: make(): need to match absolute `make` paths such as /usr/bin/make

View differences:

lib/sh/make.sh
40 40
	(
41 41
		# at verbosity < 4, hide messages about making included Makefiles
42 42
		# this can reduce # lines of output to 1/3 as much
43
		if ! "log+" 3 can_log; then fd="$log_fd" clog++ filter_fd sed \
44
-e '/^make ([^-][^[:space:]]*)?Makefile/,/^make\[[[:digit:]]+\]: .*Makefile/d' \
45
-e                                      '/^make\[[[:digit:]]+\]: .*Makefile/d'
43
		if ! "log+" 3 can_log; then
44
			local cmd="$(sys_cmd_path "$(self_name)")"; echo_vars cmd
45
			fd="$log_fd" clog++ filter_fd sed \
46
-e "\%^$cmd ([^-][^[:space:]]*)?Makefile%,/^make\[[[:digit:]]+\]: .*Makefile/d" \
47
-e                                       '/^make\[[[:digit:]]+\]: .*Makefile/d'
46 48
		fi
47 49
		time cmd_log_fd=1 self_sys $(if ! can_log; then echo '--silent ';fi)"$@"
48 50
	)

Also available in: Unified diff