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.0@241231 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/Makefile b/Makefile
index a04efe848063077d934ec79ec7b56d954d66fb65..609f08f102dd7e9d035c8059485aaa32659a1fcc 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -550,7 +550,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)))
@@ -803,7 +803,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)/*