components/desktop/firefox/patches/firefox-25-rules_mk.patch
branchs11u3-sru
changeset 7035 4c2f26e9d5ab
child 7364 1ac24a377555
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/desktop/firefox/patches/firefox-25-rules_mk.patch	Mon Sep 05 05:00:46 2016 -0700
@@ -0,0 +1,15 @@
+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
+@@ -1402,7 +1402,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