[svn-commits] russell: trunk r46094 - in /trunk: ./ Makefile

[svn-commits at lists.digium.com]

Author: russell
Date: Tue Oct 24 00:24:32 2006
New Revision: 46094

URL: http://svn.digium.com/view/asterisk?rev=46094&view=rev
Log:
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)

........

Modified:
    trunk/   (props changed)
    trunk/Makefile

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/Makefile?rev=46094&r1=46093&r2=46094&view=diff
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Tue Oct 24 00:24:32 2006
@@ -441,7 +441,9 @@
 	$(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