bug 325473 - Undo separation of language and region/content packs, part 2: use...

bug 325473 - Undo separation of language and region/content packs, part 2: use language code for default profile stuff as well, r=jag sr=Neil

mailnews/base/ispdata/Makefile.in

@@ -43,7 +43,7 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 EXPORT_DIR	= $(DIST)/bin/defaults/isp
-EXPORT_DIR_L10N	= $(DIST)/bin/defaults/isp/US
+EXPORT_DIR_L10N	= $(DIST)/bin/defaults/isp/$(AB_CD)
 
 EXPORT_RESOURCE_FILES = \
 		$(NULL)
@@ -64,6 +64,6 @@ libs:: $(EXPORT_RESOURCE_FILES)
 
 install:: $(EXPORT_RESOURCE_FILES)
 	$(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/defaults/isp
-	$(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/defaults/isp/US
+	$(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/defaults/isp/$(AB_CD)
 endif
 

mailnews/extensions/mailviews/resources/content/Makefile.in

@@ -46,7 +46,7 @@ MODULE       = mailview
 PACKAGE_FILE = mailviewdef.pkg
 
 EXPORT_DIR	= $(DIST)/bin/defaults/messenger
-EXPORT_L10N_DIR	= $(EXPORT_DIR)/US
+EXPORT_L10N_DIR	= $(EXPORT_DIR)/$(AB_CD)
 
 EXPORT_RESOURCE_FILES	= \
 			mailViews.dat \
@@ -63,5 +63,5 @@ libs:: $(EXPORT_RESOURCE_FILES)
 
 install:: $(EXPORT_RESOURCE_FILES)
 	$(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/defaults/messenger
-	$(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/defaults/messenger/US
+	$(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/defaults/messenger/$(AB_CD)
 

profile/defaults/Makefile.in

@@ -59,10 +59,10 @@ FILES := \
 
 libs:: $(FILES)
 	$(INSTALL) $^ $(DIST)/bin/defaults/profile
-	$(INSTALL) $^ $(DIST)/bin/defaults/profile/US
+	$(INSTALL) $^ $(DIST)/bin/defaults/profile/$(AB_CD)
 
 install:: $(FILES)
 	$(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/defaults/profile
-	$(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/defaults/profile/US
+	$(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/defaults/profile/$(AB_CD)
 
 

profile/defaults/chrome/Makefile.in

@@ -52,9 +52,9 @@ FILES := $(addprefix $(srcdir)/, $(FILES))
 
 libs::
 	$(INSTALL) $(FILES) $(DIST)/bin/defaults/profile/chrome
-	$(INSTALL) $(FILES) $(DIST)/bin/defaults/profile/US/chrome
+	$(INSTALL) $(FILES) $(DIST)/bin/defaults/profile/$(AB_CD)/chrome
 
 install::
 	$(SYSINSTALL) $(IFLAGS1) $(FILES) $(DESTDIR)$(mozappdir)/defaults/profile/chrome
-	$(NSINSTALL)  -t $(IFLAGS1) $(FILES) $(DESTDIR)$(mozappdir)/defaults/profile/US/chrome
+	$(NSINSTALL)  -t $(IFLAGS1) $(FILES) $(DESTDIR)$(mozappdir)/defaults/profile/$(AB_CD)/chrome