Bug 287262 part 27 - build browserconfig.properties from a locale-dependent makefile r=gandalf a=asa

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@

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

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