diff options
| -rw-r--r-- | installer/Makefile.in | 2 | ||||
| -rw-r--r-- | installer/windows/Makefile.in | 8 | ||||
| -rw-r--r-- | locales/l10n.ini | 4 | ||||
| -rw-r--r-- | themes/osx/shared.inc | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/installer/Makefile.in b/installer/Makefile.in index a7016a7..2d5a5f9 100644 --- a/installer/Makefile.in +++ b/installer/Makefile.in @@ -149,7 +149,7 @@ endif # fail to produce a langpack. See bug 1255096. libs:: ifeq (,$(filter FasterMake+RecursiveMake,$(BUILD_BACKENDS))) - $(MAKE) -C $(DEPTH)/browser/locales langpack + $(MAKE) -C $(DEPTH)/application/iceweasel-uxp/locales langpack endif ifeq (WINNT,$(OS_ARCH)) diff --git a/installer/windows/Makefile.in b/installer/windows/Makefile.in index 600bdfe..8da2f24 100644 --- a/installer/windows/Makefile.in +++ b/installer/windows/Makefile.in @@ -32,12 +32,12 @@ include $(topsrcdir)/config/config.mk ifdef LOCALE_MERGEDIR PPL_LOCALE_ARGS = \ - --l10n-dir=$(LOCALE_MERGEDIR)/browser/installer \ - --l10n-dir=$(call EXPAND_LOCALE_SRCDIR,browser/locales)/installer \ - --l10n-dir=$(topsrcdir)/browser/locales/en-US/installer \ + --l10n-dir=$(LOCALE_MERGEDIR)/application/iceweasel-uxp/installer \ + --l10n-dir=$(call EXPAND_LOCALE_SRCDIR,application/iceweasel-uxp/locales)/installer \ + --l10n-dir=$(topsrcdir)/application/iceweasel-uxp/locales/en-US/installer \ $(NULL) else -PPL_LOCALE_ARGS=$(call EXPAND_LOCALE_SRCDIR,browser/locales)/installer +PPL_LOCALE_ARGS=$(call EXPAND_LOCALE_SRCDIR,application/iceweasel-uxp/locales)/installer endif OVERRIDE_DEFAULT_GOAL := installer diff --git a/locales/l10n.ini b/locales/l10n.ini index b96007c..0e74094 100644 --- a/locales/l10n.ini +++ b/locales/l10n.ini @@ -4,12 +4,12 @@ [general] depth = ../../.. -all = browser/locales/all-locales +all = application/iceweasel-uxp/locales/all-locales [compare] dirs = browser other-licenses/branding/firefox - browser/branding/official + application/iceweasel-uxp/branding/iceweasel devtools/client [includes] diff --git a/themes/osx/shared.inc b/themes/osx/shared.inc index b3ea4e1..3076450 100644 --- a/themes/osx/shared.inc +++ b/themes/osx/shared.inc @@ -1,4 +1,4 @@ -%include ../../../toolkit/themes/osx/global/shared.inc
+%include ../../../../toolkit/themes/osx/global/shared.inc
%include ../shared/browser.inc
%filter substitution
|