From 8900126ace779bc8b6bf034ffb7df74ec5038401 Mon Sep 17 00:00:00 2001
From: "axel%pike.org" <axel%pike.org@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Tue, 13 Nov 2007 10:43:11 +0000
Subject: [PATCH] bug 401590, fix l10n-checkout for modularized trunk
 checkouts, r=bsmedberg, a=not part of fx builds

git-svn-id: svn://10.0.0.236/trunk@239307 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/client.mk | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/mozilla/client.mk b/mozilla/client.mk
index 392a87d044c..f62c81d3621 100644
--- a/mozilla/client.mk
+++ b/mozilla/client.mk
@@ -890,10 +890,18 @@ l10n-checkout:
 	$(CVSCO) $(CVS_CO_DATE_FLAGS) mozilla/client.mk $(MOZCONFIG_MODULES)
 	@cd $(ROOTDIR) && $(MAKE) -f mozilla/client.mk real_l10n-checkout
 
-EN_US_CO_DIRS := $(sort $(foreach dir,$(LOCALE_DIRS),mozilla/$(dir)/locales)) \
-  $(foreach mod,$(MOZ_PROJECT_LIST),mozilla/$(mod)/config) \
+FULL_EN_US_DIRS := toolkit \
+	extensions \
+	$(MOZ_PROJECT_LIST) \
+	$(NULL)
+
+EN_US_LOCALE_DIRS := $(foreach dir, \
+	$(filter-out toolkit extensions/% $(MOZ_PROJECT_LIST), $(LOCALE_DIRS)), \
+	mozilla/$(dir)/locales)
+
+EN_US_CO_DIRS := $(EN_US_LOCALE_DIRS) \
+  $(foreach mod,$(FULL_EN_US_DIRS),mozilla/$(mod)) \
   mozilla/client.mk        \
-  $(MOZCONFIG_MODULES)     \
   mozilla/configure        \
   mozilla/configure.in     \
   mozilla/allmakefiles.sh  \
@@ -901,17 +909,12 @@ EN_US_CO_DIRS := $(sort $(foreach dir,$(LOCALE_DIRS),mozilla/$(dir)/locales)) \
   mozilla/config           \
   $(NULL)
 
-EN_US_CO_FILES_NS :=          \
-  mozilla/toolkit/mozapps/installer \
-  $(NULL)
-
 #	Start the checkout. Split the output to the tty and a log file.
 real_l10n-checkout:
 	@set -e; \
 	cvs_co() { set -e; echo "$$@" ; \
 	  "$$@" 2>&1 | tee -a $(CVSCO_LOGFILE_L10N); }; \
 	cvs_co $(CVS) $(CVS_FLAGS) co $(MODULES_CO_FLAGS) $(CVS_CO_DATE_FLAGS) $(EN_US_CO_DIRS); \
-	cvs_co $(CVS) $(CVS_FLAGS) co $(MODULES_CO_FLAGS) $(CVS_CO_DATE_FLAGS) -l $(EN_US_CO_FILES_NS); \
 	cvs_co $(CVSCO_LOCALES)
 	@echo "checkout finish: "`date` | tee -a $(CVSCO_LOGFILE_L10N)
 #	@: Check the log for conflicts. ;