[svn-commits] file: trunk r45776 - in /trunk: ./ Makefile

[svn-commits at lists.digium.com]

Author: file
Date: Fri Oct 20 14:04:23 2006
New Revision: 45776

URL: http://svn.digium.com/view/asterisk?rev=45776&view=rev
Log:
Merged revisions 45775 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r45775 | file | 2006-10-20 15:03:03 -0400 (Fri, 20 Oct 2006) | 2 lines

Pass DESTDIR and ASTSBINDIR so that the utilities get installed in the proper location (reported on asterisk-dev mailing list)

........

Modified:
    trunk/   (props changed)
    trunk/Makefile

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/Makefile?rev=45776&r1=45775&r2=45776&view=diff
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Fri Oct 20 14:04:23 2006
@@ -437,7 +437,7 @@
 	$(INSTALL) -m 644 contrib/firmware/iax/iaxy.bin $(DESTDIR)$(ASTDATADIR)/firmware/iax/iaxy.bin; \
 
 $(SUBDIRS_INSTALL):
-	@$(MAKE) -C $(@:-install=) install
+	@DESTDIR="$(DESTDIR)" ASTSBINDIR="$(ASTSBINDIR)" $(MAKE) -C $(@:-install=) install
 
 NEWMODS=$(notdir $(wildcard */*.so))
 OLDMODS=$(filter-out $(NEWMODS),$(notdir $(wildcard $(DESTDIR)$(MODULES_DIR)/*.so)))