diff options
Diffstat (limited to 'application')
| -rw-r--r-- | application/basilisk/app.mozbuild | 6 | ||||
| -rw-r--r-- | application/basilisk/build.mk | 26 | ||||
| -rw-r--r-- | application/basilisk/installer/Makefile.in | 2 | ||||
| -rw-r--r-- | application/basilisk/installer/windows/Makefile.in | 8 | ||||
| -rw-r--r-- | application/basilisk/locales/l10n.ini | 6 | ||||
| -rw-r--r-- | application/basilisk/moz.build | 2 | ||||
| -rw-r--r-- | application/basilisk/moz.configure | 2 |
7 files changed, 26 insertions, 26 deletions
diff --git a/application/basilisk/app.mozbuild b/application/basilisk/app.mozbuild index 454933eb5..a6c2693ad 100644 --- a/application/basilisk/app.mozbuild +++ b/application/basilisk/app.mozbuild @@ -10,6 +10,6 @@ if CONFIG['MOZ_EXTENSIONS']: DIRS += ['/%s' % CONFIG['MOZ_BRANDING_DIRECTORY']] -# Never add dirs after browser because they apparently won't get -# packaged properly on Mac. -DIRS += ['/browser'] +# Never add dirs after the browser root because they apparently won't +# get packaged properly on Mac. +DIRS += ['/application/basilisk'] diff --git a/application/basilisk/build.mk b/application/basilisk/build.mk index 1bcba59d0..539c57ab1 100644 --- a/application/basilisk/build.mk +++ b/application/basilisk/build.mk @@ -3,43 +3,43 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. installer: - @$(MAKE) -C browser/installer installer + @$(MAKE) -C application/basilisk/installer installer package: - @$(MAKE) -C browser/installer + @$(MAKE) -C application/basilisk/installer package-compare: - @$(MAKE) -C browser/installer package-compare + @$(MAKE) -C application/basilisk/installer package-compare stage-package: - @$(MAKE) -C browser/installer stage-package + @$(MAKE) -C application/basilisk/installer stage-package sdk: - @$(MAKE) -C browser/installer make-sdk + @$(MAKE) -C application/basilisk/installer make-sdk install:: - @$(MAKE) -C browser/installer install + @$(MAKE) -C application/basilisk/installer install clean:: - @$(MAKE) -C browser/installer clean + @$(MAKE) -C application/basilisk/installer clean distclean:: - @$(MAKE) -C browser/installer distclean + @$(MAKE) -C application/basilisk/installer distclean source-package:: - @$(MAKE) -C browser/installer source-package + @$(MAKE) -C application/basilisk/installer source-package upload:: - @$(MAKE) -C browser/installer upload + @$(MAKE) -C application/basilisk/installer upload source-upload:: - @$(MAKE) -C browser/installer source-upload + @$(MAKE) -C application/basilisk/installer source-upload hg-bundle:: - @$(MAKE) -C browser/installer hg-bundle + @$(MAKE) -C application/basilisk/installer hg-bundle l10n-check:: - @$(MAKE) -C browser/locales l10n-check + @$(MAKE) -C application/basilisk/locales l10n-check ifdef ENABLE_TESTS # Implemented in testing/testsuite-targets.mk diff --git a/application/basilisk/installer/Makefile.in b/application/basilisk/installer/Makefile.in index 4a934fe45..4de368db7 100644 --- a/application/basilisk/installer/Makefile.in +++ b/application/basilisk/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/basilisk/locales langpack endif ifeq (WINNT,$(OS_ARCH)) diff --git a/application/basilisk/installer/windows/Makefile.in b/application/basilisk/installer/windows/Makefile.in index 600bdfeb6..d5580b53d 100644 --- a/application/basilisk/installer/windows/Makefile.in +++ b/application/basilisk/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/basilisk/installer \ + --l10n-dir=$(call EXPAND_LOCALE_SRCDIR,application/basilisk/locales)/installer \ + --l10n-dir=$(topsrcdir)/application/basilisk/locales/en-US/installer \ $(NULL) else -PPL_LOCALE_ARGS=$(call EXPAND_LOCALE_SRCDIR,browser/locales)/installer +PPL_LOCALE_ARGS=$(call EXPAND_LOCALE_SRCDIR,application/basilisk/locales)/installer endif OVERRIDE_DEFAULT_GOAL := installer diff --git a/application/basilisk/locales/l10n.ini b/application/basilisk/locales/l10n.ini index 2e387e97a..f1d22c259 100644 --- a/application/basilisk/locales/l10n.ini +++ b/application/basilisk/locales/l10n.ini @@ -3,13 +3,13 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. [general] -depth = ../.. -all = browser/locales/all-locales +depth = ../../.. +all = application/basilisk/locales/all-locales [compare] dirs = browser other-licenses/branding/firefox - browser/branding/official + application/basilisk/branding/official devtools/client [includes] diff --git a/application/basilisk/moz.build b/application/basilisk/moz.build index 0985148c0..7274f48fc 100644 --- a/application/basilisk/moz.build +++ b/application/basilisk/moz.build @@ -36,5 +36,5 @@ if CONFIG['MOZ_ARTIFACT_BUILDS']: # Ensure a pre-built interfaces.xpt installed to the objdir by the artifact # code is included by the top-level chrome.manifest. EXTRA_COMPONENTS += [ - '../build/prebuilt-interfaces.manifest', + '../../build/prebuilt-interfaces.manifest', ] diff --git a/application/basilisk/moz.configure b/application/basilisk/moz.configure index d5e7dba11..72236254f 100644 --- a/application/basilisk/moz.configure +++ b/application/basilisk/moz.configure @@ -4,4 +4,4 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -include('../toolkit/moz.configure') +include('../../toolkit/moz.configure') |