components/desktop/firefox/patches/firefox-25-rules_mk.patch
author Petr Sumbera <petr.sumbera@oracle.com>
Mon, 14 Nov 2016 04:25:50 -0800
branchs11u3-sru
changeset 7364 1ac24a377555
parent 7035 4c2f26e9d5ab
permissions -rw-r--r--
25034529 Upgrade Firefox to version 45.5.0 ESR 25099456 problem in FIREFOX/BROWSER

The ninstall... function is not callable for some reason, so we need to copy
the definition when using install_cmd.

diff --git a/config/rules.mk b/config/rules.mk
--- a/config/rules.mk
+++ b/config/rules.mk
@@ -1350,7 +1350,7 @@
 nsinstall_is_usable = $(if $(wildcard $(DEPTH)/config/nsinstall$(HOST_BIN_SUFFIX)),yes)
 
 define install_cmd_override
-$(1): install_cmd = $$(if $$(nsinstall_is_usable),$$(INSTALL),$$(NSINSTALL_PY) -t) $$(1)
+$(1): install_cmd = $$(if $(wildcard $(DIST)/bin/nsinstall$(HOST_BIN_SUFFIX)),$$(INSTALL),$$(NSINSTALL_PY) -t) $$(1)
 endef
 endif
 endif