From 63f236445ef8534c0d97d0abc34c6a0aead8598e Mon Sep 17 00:00:00 2001 From: Joshua Colp Date: Fri, 20 Oct 2006 19:04:23 +0000 Subject: [PATCH] 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: https://origsvn.digium.com/svn/asterisk/trunk@45776 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index b177aa7c84..d85a386f15 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))) -- 2.47.2