From 5bc7b6cdd9f6a5f625eff2d9d3723984c50990d1 Mon Sep 17 00:00:00 2001 From: "bsmedberg%covad.net" Date: Fri, 13 May 2005 19:52:27 +0000 Subject: [PATCH] Bug 287262 part 27 - build browserconfig.properties from a locale-dependent makefile r=gandalf a=asa --- config/autoconf.mk.in | 2 ++ other-licenses/branding/firefox/content/Makefile.in | 12 ------------ other-licenses/branding/firefox/locales/Makefile.in | 10 +++++++++- .../{content => locales}/browserconfig.properties | 0 4 files changed, 11 insertions(+), 13 deletions(-) rename other-licenses/branding/firefox/{content => locales}/browserconfig.properties (100%) mode change 100644 => 100755 diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in index 093f9e8d03d0..be7dedc858c4 100644 --- a/config/autoconf.mk.in +++ b/config/autoconf.mk.in @@ -517,6 +517,8 @@ MOZ_STATIC_MAIL_BUILD = @MOZ_STATIC_MAIL_BUILD@ MOZ_SUNBIRD = @MOZ_SUNBIRD@ WINCE = @WINCE@ +MOZ_DISTRIBUTION_ID = @MOZ_DISTRIBUTION_ID@ + MINIMO = @MINIMO@ MACOS_SDK_DIR = @MACOS_SDK_DIR@ diff --git a/other-licenses/branding/firefox/content/Makefile.in b/other-licenses/branding/firefox/content/Makefile.in index 1decefbe874d..827181f9b49f 100644 --- a/other-licenses/branding/firefox/content/Makefile.in +++ b/other-licenses/branding/firefox/content/Makefile.in @@ -8,16 +8,4 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -AB_CD = $(MOZ_UI_LOCALE) - -DEFINES += -DAB_CD=$(AB_CD) -DMOZ_DISTRIBUTION_ID_UNQUOTED=$(MOZ_DISTRIBUTION_ID_UNQUOTED) - include $(topsrcdir)/config/rules.mk - -libs locale:: - @$(PERL) $(topsrcdir)/config/preprocessor.pl $(DEFINES) $(ACDEFINES) \ - $(srcdir)/browserconfig.properties > $(DIST)/bin/browserconfig.properties - -install:: - @$(PERL) $(topsrcdir)/config/preprocessor.pl $(DEFINES) $(ACDEFINES) \ - $(srcdir)/browserconfig.properties > $(DESTDIR)$(mozappdir)/browserconfig.properties diff --git a/other-licenses/branding/firefox/locales/Makefile.in b/other-licenses/branding/firefox/locales/Makefile.in index 73db1e88fd0f..62c2cfacaf61 100755 --- a/other-licenses/branding/firefox/locales/Makefile.in +++ b/other-licenses/branding/firefox/locales/Makefile.in @@ -42,6 +42,14 @@ relativesrcdir = other-licenses/branding/firefox/locales include $(DEPTH)/config/autoconf.mk -DEFINES += -DAB_CD=$(AB_CD) +DEFINES += -DAB_CD=$(AB_CD) -DMOZ_DISTRIBUTION_ID_UNQUOTED=$(MOZ_DISTRIBUTION_ID) include $(topsrcdir)/config/rules.mk + +libs:: + @$(PERL) $(topsrcdir)/config/preprocessor.pl $(DEFINES) $(ACDEFINES) \ + $(srcdir)/browserconfig.properties > $(FINAL_TARGET)/browserconfig.properties + +install:: + @$(PERL) $(topsrcdir)/config/preprocessor.pl $(DEFINES) $(ACDEFINES) \ + $(srcdir)/browserconfig.properties > $(DESTDIR)$(mozappdir)/browserconfig.properties diff --git a/other-licenses/branding/firefox/content/browserconfig.properties b/other-licenses/branding/firefox/locales/browserconfig.properties old mode 100644 new mode 100755 similarity index 100% rename from other-licenses/branding/firefox/content/browserconfig.properties rename to other-licenses/branding/firefox/locales/browserconfig.properties