equal
deleted
inserted
replaced
1 Needs further investigation to see if this can be removed. |
|
2 The ninstall... function is not callable for some reason, so we need to copy |
|
3 the definition when using install_cmd. |
|
4 |
|
5 --- mozilla-esr31/config/rules.mk.orig 2015-06-04 17:42:51.342231683 -0700 |
|
6 +++ mozilla-esr31/config/rules.mk 2015-06-04 17:42:51.344729049 -0700 |
|
7 @@ -1429,7 +1429,7 @@ |
|
8 nsinstall_is_usable = $(if $(wildcard $(DIST)/bin/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 |
|