Merged revisions 46093 via svnmerge from
authorRussell Bryant <russell@russellbryant.com>
Tue, 24 Oct 2006 05:24:32 +0000 (05:24 +0000)
committerRussell Bryant <russell@russellbryant.com>
Tue, 24 Oct 2006 05:24:32 +0000 (05:24 +0000)
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

Makefile

index c16c03c..324b921 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -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