mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Merge mozilla-central to mozilla-inbound.
This commit is contained in:
commit
53d2b6589a
@ -620,7 +620,7 @@ ifeq ($(OS_ARCH),OS2)
|
||||
NSS_DLL_SUFFIX = .DLL
|
||||
SIGN_CMD = $(MOZILLA_DIR)/toolkit/mozapps/installer/os2/sign.cmd $(DIST)
|
||||
else
|
||||
SIGN_CMD = $(RUN_TEST_PROGRAM) $(_ABS_DIST)/bin/shlibsign$(BIN_SUFFIX) -v -i
|
||||
SIGN_CMD = $(strip $(RUN_TEST_PROGRAM) $(_ABS_DIST)/bin/shlibsign$(BIN_SUFFIX) -v -i)
|
||||
endif
|
||||
endif
|
||||
|
||||
@ -748,7 +748,8 @@ endif
|
||||
@cp -av $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/. $(DEPTH)/installer-stage/core
|
||||
@(cd $(DEPTH)/installer-stage/core && $(CREATE_PRECOMPLETE_CMD))
|
||||
ifdef MOZ_SIGN_PREPARED_PACKAGE_CMD
|
||||
$(MOZ_SIGN_PREPARED_PACKAGE_CMD) $(DEPTH)/installer-stage
|
||||
# The && true is necessary to make sure Pymake spins a shell
|
||||
$(MOZ_SIGN_PREPARED_PACKAGE_CMD) $(DEPTH)/installer-stage && true
|
||||
endif
|
||||
|
||||
elfhack:
|
||||
|
Loading…
Reference in New Issue
Block a user