| author | Wolfgang Rosenauer <wr@rosenauer.org> |
| Thu, 12 Jun 2014 00:02:30 +0200 | |
| branch | esr24 |
| changeset 743 | d43937f702f4 |
| parent 701 | ab93666f5ff7 |
| permissions | -rw-r--r-- |
|
701
ab93666f5ff7
xulrunner locale build fixes (incomplete)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1 |
# HG changeset patch |
|
ab93666f5ff7
xulrunner locale build fixes (incomplete)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
2 |
# Parent 982d6080b8827036145bc86d46a7075c3feaef2f |
|
ab93666f5ff7
xulrunner locale build fixes (incomplete)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
3 |
# User Wolfgang Rosenauer <wr@rosenauer.org> |
|
ab93666f5ff7
xulrunner locale build fixes (incomplete)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
4 |
diff --git a/toolkit/locales/Makefile.in b/toolkit/locales/Makefile.in |
|
ab93666f5ff7
xulrunner locale build fixes (incomplete)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
5 |
--- a/toolkit/locales/Makefile.in |
|
ab93666f5ff7
xulrunner locale build fixes (incomplete)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
6 |
+++ b/toolkit/locales/Makefile.in |
|
ab93666f5ff7
xulrunner locale build fixes (incomplete)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
7 |
@@ -10,16 +10,17 @@ relativesrcdir = @relativesrcdir@ |
|
ab93666f5ff7
xulrunner locale build fixes (incomplete)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
8 |
|
|
ab93666f5ff7
xulrunner locale build fixes (incomplete)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
9 |
include $(DEPTH)/config/autoconf.mk |
|
ab93666f5ff7
xulrunner locale build fixes (incomplete)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
10 |
|
|
ab93666f5ff7
xulrunner locale build fixes (incomplete)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
11 |
DEFINES += -DAB_CD=$(AB_CD) |
|
ab93666f5ff7
xulrunner locale build fixes (incomplete)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
12 |
|
|
ab93666f5ff7
xulrunner locale build fixes (incomplete)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
13 |
XULPPFLAGS += -I$(LOCALE_SRCDIR)/defines.inc |
|
ab93666f5ff7
xulrunner locale build fixes (incomplete)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
14 |
|
|
ab93666f5ff7
xulrunner locale build fixes (incomplete)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
15 |
include $(topsrcdir)/config/rules.mk |
|
ab93666f5ff7
xulrunner locale build fixes (incomplete)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
16 |
+include $(topsrcdir)/toolkit/locales/l10n.mk |
|
ab93666f5ff7
xulrunner locale build fixes (incomplete)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
17 |
|
|
ab93666f5ff7
xulrunner locale build fixes (incomplete)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
18 |
ifdef LOCALE_MERGEDIR |
|
ab93666f5ff7
xulrunner locale build fixes (incomplete)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
19 |
vpath crashreporter.% $(LOCALE_MERGEDIR)/toolkit/crashreporter |
|
ab93666f5ff7
xulrunner locale build fixes (incomplete)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
20 |
endif |
|
ab93666f5ff7
xulrunner locale build fixes (incomplete)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
21 |
vpath crashreporter.% $(LOCALE_SRCDIR)/crashreporter |
|
ab93666f5ff7
xulrunner locale build fixes (incomplete)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
22 |
ifdef LOCALE_MERGEDIR |
|
ab93666f5ff7
xulrunner locale build fixes (incomplete)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
23 |
vpath crashreporter.% @srcdir@/en-US/crashreporter |
|
ab93666f5ff7
xulrunner locale build fixes (incomplete)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
24 |
endif |