equal
deleted
inserted
replaced
1 # HG changeset patch |
1 # HG changeset patch |
2 # Parent 8d013204e3f06811daf5156939452765fb3e10bb |
2 # Parent 9b45fd4b00c45014b17358158cdb51805c8ca327 |
3 |
3 |
4 diff --git a/toolkit/mozapps/installer/package-name.mk b/toolkit/mozapps/installer/package-name.mk |
4 diff --git a/toolkit/mozapps/installer/package-name.mk b/toolkit/mozapps/installer/package-name.mk |
5 --- a/toolkit/mozapps/installer/package-name.mk |
5 --- a/toolkit/mozapps/installer/package-name.mk |
6 +++ b/toolkit/mozapps/installer/package-name.mk |
6 +++ b/toolkit/mozapps/installer/package-name.mk |
7 @@ -138,23 +138,23 @@ else |
7 @@ -138,23 +138,23 @@ else |
31 |
31 |
32 endif # PACKAGE_NAME_MK_INCLUDED |
32 endif # PACKAGE_NAME_MK_INCLUDED |
33 diff --git a/toolkit/xre/Makefile.in b/toolkit/xre/Makefile.in |
33 diff --git a/toolkit/xre/Makefile.in b/toolkit/xre/Makefile.in |
34 --- a/toolkit/xre/Makefile.in |
34 --- a/toolkit/xre/Makefile.in |
35 +++ b/toolkit/xre/Makefile.in |
35 +++ b/toolkit/xre/Makefile.in |
36 @@ -214,17 +214,17 @@ DEFINES += -DHAVE_USR_LIB64_DIR |
36 @@ -39,17 +39,17 @@ TOOLKIT_EM_VERSION=$(shell $(PERL) $(top |
37 endif |
37 # Valid if null: {warn,error}IfEmpty |
38 endif |
38 DEFINES += -DTOOLKIT_EM_VERSION='"$(TOOLKIT_EM_VERSION)"' |
39 |
39 |
40 MOZ_SOURCE_STAMP ?= $(firstword $(shell hg -R $(topsrcdir) parent --template="{node|short}\n" 2>/dev/null)) |
40 MOZ_SOURCE_STAMP ?= $(firstword $(shell hg -R $(topsrcdir) parent --template='{node|short}\n' 2>/dev/null)) |
41 ifdef MOZ_SOURCE_STAMP |
41 ifdef MOZ_SOURCE_STAMP |
42 |
42 |
43 INIARGS = --sourcestamp=$(MOZ_SOURCE_STAMP) |
43 INIARGS = --sourcestamp=$(MOZ_SOURCE_STAMP) |
44 |
44 |
45 - source_repo := $(call getSourceRepo) |
45 - source_repo := $(call getSourceRepo) |