From c73df56c8309eb73ff733f7201e91d9feb0200be Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Sat, 1 Dec 2018 16:39:51 -0500 Subject: [PALEMOON] Complete making Sync optional at build time - Part 2: Packaging --- application/palemoon/components/abouthome/jar.mn | 4 ++++ application/palemoon/installer/package-manifest.in | 2 ++ application/palemoon/locales/Makefile.in | 2 ++ 3 files changed, 8 insertions(+) (limited to 'application') 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 -- cgit v1.2.3