diff options
| author | Matt A. Tobin <email@mattatobin.com> | 2020-11-16 12:47:54 -0500 |
|---|---|---|
| committer | Moonchild <moonchild@palemoon.org> | 2020-11-18 10:59:16 +0000 |
| commit | 976ccaa9223740c743d18824f12a521ed5a5601b (patch) | |
| tree | bcae91cb897085a3e595182c6321d7f2a9273a01 /config | |
| parent | 8b3375e2c202c04935ca056cc8dc389a08e47bb6 (diff) | |
| download | UXP-976ccaa9223740c743d18824f12a521ed5a5601b.tar UXP-976ccaa9223740c743d18824f12a521ed5a5601b.tar.gz UXP-976ccaa9223740c743d18824f12a521ed5a5601b.tar.lz UXP-976ccaa9223740c743d18824f12a521ed5a5601b.tar.xz UXP-976ccaa9223740c743d18824f12a521ed5a5601b.zip | |
Issue #251 - Move chrome packaging options to ac configure
Also adds options for new functionality in #1683
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.mk | 2 | ||||
| -rw-r--r-- | config/tests/src-simple/Makefile.in | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/config/config.mk b/config/config.mk index 5a352e529..6208d124e 100644 --- a/config/config.mk +++ b/config/config.mk @@ -216,7 +216,7 @@ endif # NO_PROFILE_GUIDED_OPTIMIZE MAKE_JARS_FLAGS = \ -t $(topsrcdir) \ - -f $(MOZ_JAR_MAKER_FILE_FORMAT) \ + -f $(MOZ_CHROME_FILE_FORMAT) \ $(NULL) ifdef USE_EXTENSION_MANIFEST diff --git a/config/tests/src-simple/Makefile.in b/config/tests/src-simple/Makefile.in index 55fdfd867..96f9a4154 100644 --- a/config/tests/src-simple/Makefile.in +++ b/config/tests/src-simple/Makefile.in @@ -22,7 +22,7 @@ REF_MANIFEST = $(if $(USE_EXTENSION_MANIFEST),chrome.manifest,test.manifest) check-%:: if test -d $(FINAL_TARGET); then rm -rf $(FINAL_TARGET); fi; - $(MAKE) realchrome MOZ_JAR_MAKER_FILE_FORMAT=$* + $(MAKE) realchrome MOZ_CHROME_FILE_FORMAT=$* @echo 'Comparing manifests...' @if ! sort $(MY_MANIFEST) | diff --text -U 0 $(srcdir)/../$(REF_MANIFEST).$* - ; then \ echo 'TEST-UNEXPECTED-FAIL | config/tests/$(REF_MANIFEST).$* | differing content in manifest!' ; \ |