[asterisk-commits] qwell: branch 1.6.1 r241232 - in /branches/1.6.1: ./ Makefile

[SVN commits to the Asterisk project]

Author: qwell
Date: Tue Jan 19 11:43:10 2010
New Revision: 241232

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=241232
Log:
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
........

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/Makefile

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/Makefile
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.1/Makefile?view=diff&rev=241232&r1=241231&r2=241232
==============================================================================
--- branches/1.6.1/Makefile (original)
+++ branches/1.6.1/Makefile Tue Jan 19 11:43:10 2010
@@ -552,7 +552,7 @@
 	fi
 
 $(SUBDIRS_INSTALL):
-	@DESTDIR="$(DESTDIR)" ASTSBINDIR="$(ASTSBINDIR)" $(SUBMAKE) -C $(@:-install=) install
+	+ at 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 @@
 	@cmp -s .cleancount .lastclean || $(MAKE) clean
 
 $(SUBDIRS_UNINSTALL):
-	@$(SUBMAKE) -C $(@:-uninstall=) uninstall
+	+@$(SUBMAKE) -C $(@:-uninstall=) uninstall
 
 _uninstall: $(SUBDIRS_UNINSTALL)
 	rm -f $(DESTDIR)$(MODULES_DIR)/*