diff options
| author | Matt A. Tobin <email@mattatobin.com> | 2021-11-19 13:34:54 -0500 |
|---|---|---|
| committer | Matt A. Tobin <email@mattatobin.com> | 2021-11-19 13:34:54 -0500 |
| commit | 781e9c2fb91d0e998f060fd356815bf88fe70a2e (patch) | |
| tree | 7ab2359f2fd8dae6ace11f2f70fa9ccc854adba5 | |
| parent | 654faab56fe2888db29dec3140537b571a1ee1dd (diff) | |
| download | aura-central-781e9c2fb91d0e998f060fd356815bf88fe70a2e.tar.gz | |
Issue %3005 - Update init.configure for fallback to system/moz.configure
- This removes the completely incorrect moz.configure from toolkit
- Pale Moon and Basilisk should EITHER update the path on their application moz.configure file or just delete it because there is nothing in there anyway
| -rw-r--r-- | build/moz.configure/init.configure | 2 | ||||
| -rw-r--r-- | toolkit/moz.configure | 7 |
2 files changed, 1 insertions, 8 deletions
diff --git a/build/moz.configure/init.configure b/build/moz.configure/init.configure index 8f275aee0..98a200409 100644 --- a/build/moz.configure/init.configure +++ b/build/moz.configure/init.configure @@ -606,7 +606,7 @@ def include_project_configure(project, external_source_dir, build_env, help): if exists(path_project_src_dir_root): return path_project_src_dir_root else: - return os.path.join(build_env.topsrcdir, 'toolkit', 'moz.configure') + return os.path.join(build_env.topsrcdir, 'system', 'moz.configure') @depends('--with-external-source-dir') def external_source_dir(value): diff --git a/toolkit/moz.configure b/toolkit/moz.configure deleted file mode 100644 index 61b9ddddb..000000000 --- a/toolkit/moz.configure +++ /dev/null @@ -1,7 +0,0 @@ -# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*- -# 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/. - -# This file is obsolete. Please use the following directly: -include('/system/moz.configure') |