[asterisk-commits] file: branch 1.4 r45775 - /branches/1.4/Makefile

[asterisk-commits at lists.digium.com]

Author: file
Date: Fri Oct 20 14:03:03 2006
New Revision: 45775

URL: http://svn.digium.com/view/asterisk?rev=45775&view=rev
Log:
Pass DESTDIR and ASTSBINDIR so that the utilities get installed in the proper location (reported on asterisk-dev mailing list)

Modified:
    branches/1.4/Makefile

Modified: branches/1.4/Makefile
URL: http://svn.digium.com/view/asterisk/branches/1.4/Makefile?rev=45775&r1=45774&r2=45775&view=diff
==============================================================================
--- branches/1.4/Makefile (original)
+++ branches/1.4/Makefile Fri Oct 20 14:03:03 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)))