summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--devtools/moz.build2
-rw-r--r--toolkit/themes/linux/mozapps/jar.mn2
-rw-r--r--toolkit/themes/shared/non-mac.jar.inc.mn2
-rw-r--r--toolkit/themes/windows/global/jar.mn2
-rw-r--r--toolkit/themes/windows/mozapps/jar.mn2
5 files changed, 5 insertions, 5 deletions
diff --git a/devtools/moz.build b/devtools/moz.build
index 6ba36fe4b..fb09da5a2 100644
--- a/devtools/moz.build
+++ b/devtools/moz.build
@@ -14,6 +14,6 @@ if CONFIG['MOZ_DEVTOOLS']:
# /browser uses DIST_SUBDIR. We opt-in to this treatment when building
# DevTools for the browser to keep the root omni.ja slim for use by external XUL
# apps. Mulet also uses this since it includes /browser.
-if CONFIG['MOZ_PHOENIX']:
+if CONFIG['MOZ_PHOENIX'] and not CONFIG['MC_PALEMOON']:
DIST_SUBDIR = 'browser'
export('DIST_SUBDIR')
diff --git a/toolkit/themes/linux/mozapps/jar.mn b/toolkit/themes/linux/mozapps/jar.mn
index 27b647308..efb5b1234 100644
--- a/toolkit/themes/linux/mozapps/jar.mn
+++ b/toolkit/themes/linux/mozapps/jar.mn
@@ -44,7 +44,7 @@ toolkit.jar:
skin/classic/mozapps/update/updates.css (update/updates.css)
skin/classic/mozapps/viewsource/viewsource.css (viewsource/viewsource.css)
-#ifdef MOZ_PHOENIX
+#if defined(MOZ_PHOENIX) && !defined(MC_PALEMOON)
[browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}] chrome.jar:
#elif MOZ_SEPARATE_MANIFEST_FOR_THEME_OVERRIDES
[extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}] chrome.jar:
diff --git a/toolkit/themes/shared/non-mac.jar.inc.mn b/toolkit/themes/shared/non-mac.jar.inc.mn
index b17e9d7ba..60ec31350 100644
--- a/toolkit/themes/shared/non-mac.jar.inc.mn
+++ b/toolkit/themes/shared/non-mac.jar.inc.mn
@@ -117,7 +117,7 @@
skin/classic/mozapps/profile/profileSelection.css (../../windows/mozapps/profile/profileSelection.css)
skin/classic/mozapps/update/downloadButtons.png (../../windows/mozapps/update/downloadButtons.png)
-#ifdef MOZ_PHOENIX
+#if defined(MOZ_PHOENIX) && !defined(MC_PALEMOON)
[browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}] chrome.jar:
#elif MOZ_SEPARATE_MANIFEST_FOR_THEME_OVERRIDES
[extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}] chrome.jar:
diff --git a/toolkit/themes/windows/global/jar.mn b/toolkit/themes/windows/global/jar.mn
index 6f0cf4130..f8bd82a7a 100644
--- a/toolkit/themes/windows/global/jar.mn
+++ b/toolkit/themes/windows/global/jar.mn
@@ -64,7 +64,7 @@ toolkit.jar:
skin/classic/global/tree/twisty.svg (tree/twisty.svg)
skin/classic/global/tree/twisty-preWin10.svg (tree/twisty-preWin10.svg)
-#ifdef MOZ_PHOENIX
+#if defined(MOZ_PHOENIX) && !defined(MC_PALEMOON)
[browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}] chrome.jar:
#elif MOZ_SEPARATE_MANIFEST_FOR_THEME_OVERRIDES
[extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}] chrome.jar:
diff --git a/toolkit/themes/windows/mozapps/jar.mn b/toolkit/themes/windows/mozapps/jar.mn
index 5ca886051..4e5d6d6c1 100644
--- a/toolkit/themes/windows/mozapps/jar.mn
+++ b/toolkit/themes/windows/mozapps/jar.mn
@@ -62,7 +62,7 @@ toolkit.jar:
skin/classic/mozapps/update/updates.css (update/updates.css)
skin/classic/mozapps/viewsource/viewsource.css (viewsource/viewsource.css)
-#ifdef MOZ_PHOENIX
+#if defined(MOZ_PHOENIX) && !defined(MC_PALEMOON)
[browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}] chrome.jar:
#elif MOZ_SEPARATE_MANIFEST_FOR_THEME_OVERRIDES
[extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}] chrome.jar: