aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorfile <file@f38db490-d61c-443f-a65b-d21fe96a405b>2006-10-20 19:04:23 +0000
committerfile <file@f38db490-d61c-443f-a65b-d21fe96a405b>2006-10-20 19:04:23 +0000
commitd6ef08c641a941580d3e250d91cb2ba1482ae0ac (patch)
treeb585fac8003866ea554468e3e01f046e5c59456e /Makefile
parentdbd3fe7af39b26e68cc01e32fe72ab255cc10d84 (diff)
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) ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@45776 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index b177aa7c8..d85a386f1 100644
--- 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)))