components/desktop/firefox/patches/firefox-25-rules_mk.patch
branchs11u3-sru
changeset 7035 4c2f26e9d5ab
child 7364 1ac24a377555
equal deleted inserted replaced
7034:55c87002c655 7035:4c2f26e9d5ab
       
     1 The ninstall... function is not callable for some reason, so we need to copy
       
     2 the definition when using install_cmd.
       
     3 
       
     4 diff --git a/config/rules.mk b/config/rules.mk
       
     5 --- a/config/rules.mk
       
     6 +++ b/config/rules.mk
       
     7 @@ -1402,7 +1402,7 @@
       
     8  nsinstall_is_usable = $(if $(wildcard $(DEPTH)/config/nsinstall$(HOST_BIN_SUFFIX)),yes)
       
     9      
       
    10  define install_cmd_override
       
    11 -$(1): install_cmd = $$(if $$(nsinstall_is_usable),$$(INSTALL),$$(NSINSTALL_PY) -t) $$(1)
       
    12 +$(1): install_cmd = $$(if $(wildcard $(DIST)/bin/nsinstall$(HOST_BIN_SUFFIX)),$$(INSTALL),$$(NSINSTALL_PY) -t) $$(1)
       
    13  endef
       
    14  endif
       
    15  endif