From: Michael R. Crusoe <crusoe@debian.org>
Subject: Allow the easel Makefile to be verbosely run from the hmmer Makefile
Forwarded: not-needed
--- hmmer.orig/Makefile.in
+++ hmmer/Makefile.in
@@ -67,16 +67,16 @@
 
 # beautification magic stolen from git 
 #
-QUIET_SUBDIR0 = +${MAKE} -C #space separator after -c
+QUIET_SUBDIR0 = $(MAKE) -C #space separator after -c
 QUIET_SUBDIR1 = 
 ifndef V
 	QUIET         = @
 	QUIET_CC      = @echo '    ' CC $@;
 	QUIET_GEN     = @echo '    ' GEN $@;
 	QUIET_AR      = @echo '    ' AR $@;
-	QUIET_SUBDIR0 = +@subdir=
+	QUIET_SUBDIR0 = @subdir=
 	QUIET_SUBDIR1 = ; echo '    ' SUBDIR $$subdir; \
-		        ${MAKE} -s -C $$subdir
+		       $(MAKE) -s -C $$subdir
 endif
 
 .PHONY: all dev check pdf install install-strip uninstall clean distclean TAGS
@@ -85,36 +85,36 @@
 #      (Excludes test programs.)
 #
 all: 
-	${QUIET_SUBDIR0}${ESLDIR}     ${QUIET_SUBDIR1} all
-	${QUIET_SUBDIR0}src           ${QUIET_SUBDIR1} all
-	${QUIET_SUBDIR0}profmark      ${QUIET_SUBDIR1} all
+	+${QUIET_SUBDIR0}${ESLDIR}     ${QUIET_SUBDIR1} all
+	+${QUIET_SUBDIR0}src           ${QUIET_SUBDIR1} all
+	+${QUIET_SUBDIR0}profmark      ${QUIET_SUBDIR1} all
 
 # dev: compile all executables, including drivers.
 #
 dev: 
-	${QUIET_SUBDIR0}${ESLDIR}  ${QUIET_SUBDIR1} dev
-	${QUIET_SUBDIR0}src        ${QUIET_SUBDIR1} dev
-	${QUIET_SUBDIR0}profmark   ${QUIET_SUBDIR1} dev
+	+${QUIET_SUBDIR0}${ESLDIR}  ${QUIET_SUBDIR1} dev
+	+${QUIET_SUBDIR0}src        ${QUIET_SUBDIR1} dev
+	+${QUIET_SUBDIR0}profmark   ${QUIET_SUBDIR1} dev
 
 # tests: compile all test drivers for 'make check'
 #
 tests:
-	${QUIET_SUBDIR0}${ESLDIR}  ${QUIET_SUBDIR1} tests
-	${QUIET_SUBDIR0}src        ${QUIET_SUBDIR1} tests
+	+${QUIET_SUBDIR0}${ESLDIR}  ${QUIET_SUBDIR1} tests
+	+${QUIET_SUBDIR0}src        ${QUIET_SUBDIR1} tests
 
 # check: Run test suites.
 #
 check:
 	@command -v python3 >/dev/null 2>&1 || { echo >&2 "python3 is required for 'make check', but is not in your PATH. Aborting."; exit 1; }
-	${QUIET_SUBDIR0}${ESLDIR}  ${QUIET_SUBDIR1} tests
-	${QUIET_SUBDIR0}src        ${QUIET_SUBDIR1} tests
-	${QUIET_SUBDIR0}${ESLDIR}  ${QUIET_SUBDIR1} check
-	${QUIET_SUBDIR0}testsuite  ${QUIET_SUBDIR1} check
+	+${QUIET_SUBDIR0}${ESLDIR}  ${QUIET_SUBDIR1} tests
+	+${QUIET_SUBDIR0}src        ${QUIET_SUBDIR1} tests
+	+${QUIET_SUBDIR0}${ESLDIR}  ${QUIET_SUBDIR1} check
+	+${QUIET_SUBDIR0}testsuite  ${QUIET_SUBDIR1} check
 
 # pdf: compile the User Guides.
 #
 pdf:
-	${QUIET_SUBDIR0}documentation ${QUIET_SUBDIR1} pdf
+	+${QUIET_SUBDIR0}documentation ${QUIET_SUBDIR1} pdf
 
 # install: binaries in ${bindir}/, man pages in ${man1dir}/
 #          Creates these directories if they don't exist.
@@ -127,8 +127,8 @@
 install: all
 	${INSTALL} -d ${DESTDIR}${bindir}
 	${INSTALL} -d ${DESTDIR}${man1dir}
-	${MAKE} -C src install
-	${MAKE} -C documentation install
+	+$(MAKE) -C src install
+	+$(MAKE) -C documentation install
 
 # install-strip: same as install, but strip binaries
 #
@@ -147,11 +147,11 @@
 # "make clean" removes almost everything except configuration files.
 #
 clean:
-	${QUIET_SUBDIR0}src           ${QUIET_SUBDIR1} clean
-	${QUIET_SUBDIR0}profmark      ${QUIET_SUBDIR1} clean
-	${QUIET_SUBDIR0}testsuite     ${QUIET_SUBDIR1} clean
-	${QUIET_SUBDIR0}documentation ${QUIET_SUBDIR1} clean
-	${QUIET_SUBDIR0}${ESLDIR}     ${QUIET_SUBDIR1} clean
+	+${QUIET_SUBDIR0}src           ${QUIET_SUBDIR1} clean
+	+${QUIET_SUBDIR0}profmark      ${QUIET_SUBDIR1} clean
+	+${QUIET_SUBDIR0}testsuite     ${QUIET_SUBDIR1} clean
+	+${QUIET_SUBDIR0}documentation ${QUIET_SUBDIR1} clean
+	+${QUIET_SUBDIR0}${ESLDIR}     ${QUIET_SUBDIR1} clean
 	${QUIET}-rm -f *.o *~ Makefile.bak core TAGS TAGS.part gmon.out
 ifndef V
 	@echo '     ' CLEAN hmmer
--- hmmer.orig/easel/Makefile.in
+++ hmmer/easel/Makefile.in
@@ -80,7 +80,7 @@
 
 # beautification magic, stolen from git
 #
-QUIET_SUBDIR0 = +${MAKE} -C #space separator after -c
+QUIET_SUBDIR0 = $(MAKE) -C #space separator after -c
 QUIET_SUBDIR1 =
 ifndef V
 	QUIET         = @
@@ -89,7 +89,7 @@
 	QUIET_AR      = @echo '    ' AR $@;
 	QUIET_SUBDIR0 = +@subdir=
 	QUIET_SUBDIR1 = ; echo '    ' SUBDIR  $$subdir; \
-		        ${MAKE} -s -C $$subdir
+		        $(MAKE) -s -C $$subdir
 endif
 
 
@@ -629,7 +629,7 @@
 install:
 	${INSTALL} -d ${DESTDIR}${bindir}
 	${INSTALL} -d ${DESTDIR}${man1dir}
-	${MAKE} -C miniapps install
+	+$(MAKE) -C miniapps install
 
 uninstall:
 	${MAKE} -C miniapps uninstall
--- hmmer.orig/src/Makefile.in
+++ hmmer/src/Makefile.in
@@ -230,7 +230,7 @@
 	p7_spensemble_example
 
 # beautification magic stolen from git
-QUIET_SUBDIR0 = +${MAKE} -C #space separator after -c
+QUIET_SUBDIR0 = $(MAKE) -C #space separator after -c
 QUIET_SUBDIR1 = 
 ifndef V
 	QUIET_CC      = @echo '    ' CC $@;
@@ -238,7 +238,7 @@
 	QUIET_AR      = @echo '    ' AR $@;
 	QUIET_SUBDIR0 = +@subdir=
 	QUIET_SUBDIR1 = ; echo '    ' SUBDIR $$subdir; \
-		        ${MAKE} -s -C $$subdir
+		        $(MAKE) -s -C $$subdir
 endif
 
 .PHONY: all dev tests check install install-strip uninstall distclean clean TAGS
