aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2010-06-28 15:58:48 +0000
committerrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2010-06-28 15:58:48 +0000
commitb0c9dc0ba2b17eaa5ab5206aab21c65442f52909 (patch)
treeff5f1add78620cccef55359794a4c1f7e34ccf51
parent9caa33b1d80fb14add6bc70f77943be46f1d7e0d (diff)
Backport method of setting SUBMAKE from trunk.
By setting the PRINT_DIR variable, SUBMAKE will print out the directories it descends into, which is important for editors (like vim) that watch the build output so that they can take you to the file where an error occurred. git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@272688 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r--Makefile6
1 files changed, 5 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 6a6eae5d7..28e9e51cf 100644
--- a/Makefile
+++ b/Makefile
@@ -293,7 +293,11 @@ ifeq ($(OSARCH),SunOS)
SOLINK=-shared -fpic -L/usr/local/ssl/lib -lrt
endif
-SUBMAKE=$(MAKE) --quiet --no-print-directory
+ifneq ($(PRINT_DIR)$(NOISY_BUILD),)
+SUBMAKE:=$(MAKE)
+else
+SUBMAKE:=$(MAKE) --quiet --no-print-directory
+endif
# This is used when generating the doxygen documentation
ifneq ($(DOT),:)