From: Jason Parker <jparker@digium.com>
Date: Tue, 19 Jan 2010 17:43:10 +0000 (+0000)
Subject: Merged revisions 241230 via svnmerge from
X-Git-Tag: 1.6.1.15-rc1~40
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b36efa71bf31b2c53140ed6e9b04709ce4691581;p=thirdparty%2Fasterisk.git

Merged revisions 241230 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r241230 | qwell | 2010-01-19 11:42:10 -0600 (Tue, 19 Jan 2010) | 10 lines

  Allow parallel make (-j) to work properly.

  After some back and forth with the reporter, we came up with the necessary changes.

  (closes issue #16489)
  Reported by: Chainsaw
  Patches:
        asterisk-1.6.2.1-parallel-make-minimal.patch uploaded by Chainsaw (license 723)
  Tested by: Chainsaw, qwell
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@241232 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/Makefile b/Makefile
index 19c54ab918..842dc03cee 100644
--- a/Makefile
+++ b/Makefile
@@ -552,7 +552,7 @@ bininstall: _all installdirs $(SUBDIRS_INSTALL)
 	fi
 
 $(SUBDIRS_INSTALL):
-	@DESTDIR="$(DESTDIR)" ASTSBINDIR="$(ASTSBINDIR)" $(SUBMAKE) -C $(@:-install=) install
+	+@DESTDIR="$(DESTDIR)" ASTSBINDIR="$(ASTSBINDIR)" $(SUBMAKE) -C $(@:-install=) install
 
 NEWMODS:=$(foreach d,$(MOD_SUBDIRS),$(notdir $(wildcard $(d)/*.so)))
 OLDMODS=$(filter-out $(NEWMODS),$(notdir $(wildcard $(DESTDIR)$(MODULES_DIR)/*.so)))
@@ -805,7 +805,7 @@ cleantest:
 	@cmp -s .cleancount .lastclean || $(MAKE) clean
 
 $(SUBDIRS_UNINSTALL):
-	@$(SUBMAKE) -C $(@:-uninstall=) uninstall
+	+@$(SUBMAKE) -C $(@:-uninstall=) uninstall
 
 _uninstall: $(SUBDIRS_UNINSTALL)
 	rm -f $(DESTDIR)$(MODULES_DIR)/*