diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-10-24 05:24:32 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-10-24 05:24:32 +0000 |
| commit | 7101addb28be66d7e20fdb10571aff252fae3020 (patch) | |
| tree | 86b6aa5d0b681c97c1c6ca61b669cc73cd9dfbe7 /Makefile | |
| parent | 78ad5683385688f3afe17fccf38c57be70278aab (diff) | |
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: http://svn.digium.com/svn/asterisk/trunk@46094 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -441,7 +441,9 @@ bininstall: _all $(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/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): @DESTDIR="$(DESTDIR)" ASTSBINDIR="$(ASTSBINDIR)" $(MAKE) -C $(@:-install=) install |