diff options
| author | Matt A. Tobin <email@mattatobin.com> | 2018-12-01 16:39:51 -0500 |
|---|---|---|
| committer | Matt A. Tobin <email@mattatobin.com> | 2018-12-01 16:39:51 -0500 |
| commit | d3e5569ee138378a0b26921206edd0b2627c24ab (patch) | |
| tree | 4b5db55d187db6ed689430be6007d3e1ae93ca89 | |
| parent | e5e21699ca95369651670a302fde26dc6c19b4bd (diff) | |
| download | UXP-d3e5569ee138378a0b26921206edd0b2627c24ab.tar UXP-d3e5569ee138378a0b26921206edd0b2627c24ab.tar.gz UXP-d3e5569ee138378a0b26921206edd0b2627c24ab.tar.lz UXP-d3e5569ee138378a0b26921206edd0b2627c24ab.tar.xz UXP-d3e5569ee138378a0b26921206edd0b2627c24ab.zip | |
[PALEMOON] Complete making Sync optional at build time - Part 2: Packaging
| -rw-r--r-- | application/palemoon/components/abouthome/jar.mn | 4 | ||||
| -rw-r--r-- | application/palemoon/installer/package-manifest.in | 2 | ||||
| -rw-r--r-- | application/palemoon/locales/Makefile.in | 2 |
3 files changed, 8 insertions, 0 deletions
diff --git a/application/palemoon/components/abouthome/jar.mn b/application/palemoon/components/abouthome/jar.mn index 4f39df300..e1ae4ac42 100644 --- a/application/palemoon/components/abouthome/jar.mn +++ b/application/palemoon/components/abouthome/jar.mn @@ -13,7 +13,9 @@ browser.jar: content/browser/abouthome/bookmarks.png content/browser/abouthome/history.png content/browser/abouthome/addons.png +#ifdef MOZ_SERVICES_SYNC content/browser/abouthome/sync.png +#endif content/browser/abouthome/settings.png content/browser/abouthome/restore.png content/browser/abouthome/restore-large.png @@ -23,7 +25,9 @@ browser.jar: content/browser/abouthome/bookmarks@2x.png content/browser/abouthome/history@2x.png content/browser/abouthome/addons@2x.png +#ifdef MOZ_SERVICES_SYNC content/browser/abouthome/sync@2x.png +#endif content/browser/abouthome/settings@2x.png content/browser/abouthome/restore@2x.png content/browser/abouthome/restore-large@2x.png
\ No newline at end of file diff --git a/application/palemoon/installer/package-manifest.in b/application/palemoon/installer/package-manifest.in index e63af4013..656e60cb7 100644 --- a/application/palemoon/installer/package-manifest.in +++ b/application/palemoon/installer/package-manifest.in @@ -248,8 +248,10 @@ ; gre location for now. @RESPATH@/defaults/pref/channel-prefs.js +#ifdef MOZ_SERVICES_SYNC ; Services (gre) prefs @RESPATH@/defaults/pref/services-sync.js +#endif ; [Layout Engine Resources] ; Style Sheets, Graphics and other Resources used by the layout engine. diff --git a/application/palemoon/locales/Makefile.in b/application/palemoon/locales/Makefile.in index c81329a9a..38a867658 100644 --- a/application/palemoon/locales/Makefile.in +++ b/application/palemoon/locales/Makefile.in @@ -121,7 +121,9 @@ searchplugins: $(addprefix $(FINAL_TARGET)/searchplugins/,$(SEARCHPLUGINS)) libs-%: $(NSINSTALL) -D $(DIST)/install @$(MAKE) -C ../../../toolkit/locales libs-$* +ifdef MOZ_SERVICES_SYNC @$(MAKE) -C ../../../services/sync/locales AB_CD=$* XPI_NAME=locale-$* +endif @$(MAKE) -C ../../../extensions/spellcheck/locales AB_CD=$* XPI_NAME=locale-$* @$(MAKE) -C ../../../intl/locales AB_CD=$* XPI_NAME=locale-$* ifdef MOZ_DEVTOOLS |