Skip to content
Snippets Groups Projects
Commit 61056be5 authored by Russell Bryant's avatar Russell Bryant
Browse files

Merged revisions 46093 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r46093 | russell | 2006-10-24 01:23:33 -0400 (Tue, 24 Oct 2006) | 3 lines

Restore the ability to remove the firmware directory without causing the
installation to fail (issue #8111)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@46094 65c4cc65-6c06-0410-ace0-fbb531ad65f3
parent b7c64834
No related branches found
No related tags found
No related merge requests found
...@@ -441,7 +441,9 @@ bininstall: _all ...@@ -441,7 +441,9 @@ bininstall: _all
$(INSTALL) -m 644 contrib/scripts/astgenkey.8 $(DESTDIR)$(ASTMANDIR)/man8 $(INSTALL) -m 644 contrib/scripts/astgenkey.8 $(DESTDIR)$(ASTMANDIR)/man8
$(INSTALL) -m 644 contrib/scripts/autosupport.8 $(DESTDIR)$(ASTMANDIR)/man8 $(INSTALL) -m 644 contrib/scripts/autosupport.8 $(DESTDIR)$(ASTMANDIR)/man8
$(INSTALL) -m 644 contrib/scripts/safe_asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8 $(INSTALL) -m 644 contrib/scripts/safe_asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8
$(INSTALL) -m 644 contrib/firmware/iax/iaxy.bin $(DESTDIR)$(ASTDATADIR)/firmware/iax/iaxy.bin; \ if [ -f contrib/firmware/iax/iaxy.bin ] ; then \
$(INSTALL) -m 644 contrib/firmware/iax/iaxy.bin $(DESTDIR)$(ASTDATADIR)/firmware/iax/iaxy.bin; \
fi
$(SUBDIRS_INSTALL): $(SUBDIRS_INSTALL):
@DESTDIR="$(DESTDIR)" ASTSBINDIR="$(ASTSBINDIR)" $(MAKE) -C $(@:-install=) install @DESTDIR="$(DESTDIR)" ASTSBINDIR="$(ASTSBINDIR)" $(MAKE) -C $(@:-install=) install
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment