]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Pass DESTDIR and ASTSBINDIR so that the utilities get installed in the proper locatio...
authorJoshua Colp <jcolp@digium.com>
Fri, 20 Oct 2006 19:03:03 +0000 (19:03 +0000)
committerJoshua Colp <jcolp@digium.com>
Fri, 20 Oct 2006 19:03:03 +0000 (19:03 +0000)
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@45775 65c4cc65-6c06-0410-ace0-fbb531ad65f3

Makefile

index b177aa7c840fc0adca27fd715c2eef3fa79d0dbe..d85a386f15d2e5fdc4cab3c0999ea33e4c5a70bf 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -437,7 +437,7 @@ bininstall: _all
        $(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)))