[svn-commits] russell: branch 1.4 r46093 - /branches/1.4/Makefile

svn-commits at lists.digium.com svn-commits at lists.digium.com
Mon Oct 23 22:23:33 MST 2006


Author: russell
Date: Tue Oct 24 00:23:33 2006
New Revision: 46093

URL: http://svn.digium.com/view/asterisk?rev=46093&view=rev
Log:
Restore the ability to remove the firmware directory without causing the
installation to fail (issue #8111)

Modified:
    branches/1.4/Makefile

Modified: branches/1.4/Makefile
URL: http://svn.digium.com/view/asterisk/branches/1.4/Makefile?rev=46093&r1=46092&r2=46093&view=diff
==============================================================================
--- branches/1.4/Makefile (original)
+++ branches/1.4/Makefile Tue Oct 24 00:23:33 2006
@@ -434,7 +434,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



More information about the svn-commits mailing list