Merge branch 'master' of https://github.com/MoonchildProductions/UXP

11 files changed, 6 insertions, 24 deletions

diff --git a/application/basilisk/fonts/README.txt b/application/basilisk/fonts/README.txt
deleted file mode 100644
index ac1f6d9de..000000000
--- a/application/basilisk/fonts/README.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-Twemoji Mozilla
-================
-
-The upstream repository of Twemoji Mozilla can be found at
-
-  https://github.com/mozilla/twemoji-colr
-
-Please refer commit history for the current version of the font.
-This file purposely omit the version, so there is no need to update it here.
diff --git a/application/basilisk/fonts/moz.build b/application/basilisk/fonts/moz.build
deleted file mode 100644
index 5cb98333b..000000000
--- a/application/basilisk/fonts/moz.build
+++ /dev/null
@@ -1,11 +0,0 @@
-# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# 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/.
-
-if CONFIG['OS_ARCH'] in ('WINNT', 'Linux'):
-    DIST_SUBDIR = ''
-    FINAL_TARGET_FILES.fonts += [
-        'TwemojiMozilla.ttf'
-    ]
diff --git a/application/basilisk/moz.build b/application/basilisk/moz.build
index 7274f48fc..2c3c95fa2 100644
--- a/application/basilisk/moz.build
+++ b/application/basilisk/moz.build
@@ -11,7 +11,6 @@ SPHINX_TREES['browser'] = 'docs'
 DIRS += [
     'base',
     'components',
-    'fonts',
     'locales',
     'modules',
     'themes',
diff --git a/application/palemoon/fonts/TwemojiMozilla.ttf b/application/palemoon/fonts/TwemojiMozilla.ttf
deleted file mode 100644
index d79250cb0..000000000
--- a/application/palemoon/fonts/TwemojiMozilla.ttf
+++ /dev/null
diff --git a/application/palemoon/moz.build b/application/palemoon/moz.build
index 72e37673c..f04ad1c7d 100644
--- a/application/palemoon/moz.build
+++ b/application/palemoon/moz.build
@@ -9,7 +9,6 @@ CONFIGURE_SUBST_FILES += ['installer/Makefile']
 DIRS += [
     'base',
     'components',
-    'fonts',
     'locales',
     'modules',
     'themes',
diff --git a/config/config.mk b/config/config.mk
index 24442bfe9..5a352e529 100644
--- a/config/config.mk
+++ b/config/config.mk
@@ -107,7 +107,7 @@ ifeq ($(HOST_OS_ARCH),WINNT)
     # This means we're in comm-central's topsrcdir, so we need to adjust
     # WIN_TOP_SRC (which points to mozilla's topsrcdir) for the substitution
     # to win_srcdir.
-		cc_WIN_TOP_SRC := $(WIN_TOP_SRC:%/mozilla=%)
+    cc_WIN_TOP_SRC := $(WIN_TOP_SRC:%$(subst $(topsrcdir),,$(MOZILLA_DIR))=%)
     win_srcdir := $(subst $(topsrcdir),$(cc_WIN_TOP_SRC),$(srcdir))
   endif
   BUILD_TOOLS = $(WIN_TOP_SRC)/build/unix
diff --git a/old-configure.in b/old-configure.in
index 49f45280e..9398ef0fc 100644
--- a/old-configure.in
+++ b/old-configure.in
@@ -3691,6 +3691,8 @@ if test -n "$MOZ_BUNDLED_FONTS"; then
   AC_DEFINE(MOZ_BUNDLED_FONTS)
 fi
 
+AC_SUBST(MOZ_BUNDLED_FONTS)
+
 dnl ========================================================
 dnl Verify MAR signatures
 dnl ========================================================
diff --git a/application/palemoon/fonts/README.txt b/toolkit/fonts/README.txt
index bf5cb7e6e..bf5cb7e6e 100644
--- a/application/palemoon/fonts/README.txt
+++ b/toolkit/fonts/README.txt
diff --git a/application/basilisk/fonts/TwemojiMozilla.ttf b/toolkit/fonts/TwemojiMozilla.ttf
index d79250cb0..d79250cb0 100644
--- a/application/basilisk/fonts/TwemojiMozilla.ttf
+++ b/toolkit/fonts/TwemojiMozilla.ttf
diff --git a/application/palemoon/fonts/moz.build b/toolkit/fonts/moz.build
index 8840a87f8..fb6a9b24c 100644
--- a/application/palemoon/fonts/moz.build
+++ b/toolkit/fonts/moz.build
@@ -5,5 +5,4 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 if CONFIG['OS_ARCH'] in ('WINNT', 'Linux'):
-    DIST_SUBDIR = ''
     FINAL_TARGET_FILES.fonts += ['TwemojiMozilla.ttf']
diff --git a/toolkit/moz.build b/toolkit/moz.build
index 397444828..b02d122cd 100644
--- a/toolkit/moz.build
+++ b/toolkit/moz.build
@@ -19,6 +19,9 @@ DIRS += [
     'themes',
 ]
 
+if CONFIG['MOZ_BUNDLED_FONTS']:
+    DIRS += ['fonts']
+
 if CONFIG['MOZ_JETPACK']:
     DIRS += ['jetpack']