From f381a86bf79597b17b1ee725d405ae453621421e Mon Sep 17 00:00:00 2001
From: Ted Pavlic <ted@tedpavlic.com>
Date: Wed, 21 Jan 2009 10:41:42 -0500
Subject: [PATCH] Temporary fix for "Sanitize Makefile.doc"
 (1e4369cb40de23bd912bb7b5175c6cfae4e665c2)

More elegant fix to come, but something was needed so that "make xpi"
could build.
---
 common/Makefile.common | 16 +++++++++-------
 common/Makefile.doc    |  4 ++--
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/common/Makefile.common b/common/Makefile.common
index 7b590bad..9c6c26fd 100644
--- a/common/Makefile.common
+++ b/common/Makefile.common
@@ -26,7 +26,7 @@ XPI_BINS      = jar
 
 XPI_NAME      = $(NAME)_$(VERSION)
 XPI_PATH      = ../downloads/$(XPI_NAME)
-XPI	      = $(XPI_PATH).xpi
+XPI	          = $(XPI_PATH).xpi
 
 RDF           = ../downloads/update.rdf
 RDF_IN        = $(RDF).in
@@ -44,7 +44,7 @@ $(TARGETS:%=\%.%):
 	echo MAKE $* $(@:$*.%=%)
 	$(MAKE) -C $* $(@:$*.%=%)
 
-$(TARGETS): %: $(LOCALES:%=%.%)
+#$(TARGETS): %: $(LOCALES:%=%.%)
 
 .PHONY: $(TARGETS)
 all: help
@@ -82,11 +82,13 @@ $(RDF): $(RDF_IN) Makefile
 	@echo "SUCCESS: $@"
 
 clean:
-	@echo "Cleanup..."
+	@echo "General $(NAME) cleanup..."
+	@set -e; for locale in $(LOCALES); do $(MAKE) -C $$locale clean; done
 	rm -f $(JAR) $(XPI)
 
-distclean: clean $(LOCALES:%=%.distclean)
-	@echo "More cleanup..."
+distclean: clean
+	@echo "More $(NAME) cleanup..."
+	@set -e; for locale in $(LOCALES); do $(MAKE) -C $$locale distclean; done
 	rm -rf $(BUILD_DIR)
 
 #### xpi
@@ -107,5 +109,5 @@ $(JAR): doc
 
 #### doc (see Makefile.doc)
 
-doc: $(LOCALES:%=%.doc) ;
-
+doc:
+	@set -e; for locale in $(LOCALES); do $(MAKE) -C $$locale doc; done
diff --git a/common/Makefile.doc b/common/Makefile.doc
index b23e92fd..cdb6da3d 100644
--- a/common/Makefile.doc
+++ b/common/Makefile.doc
@@ -32,10 +32,10 @@ help:
 	@echo "  make distclean - clean up more"
 
 clean:
-	@echo "Cleanup..."
+	@echo "  Cleanup of $(LOCALE) documentation..."
 
 distclean: clean
-	@echo "More cleanup..."
+	@echo "    More cleanup of $(LOCALE) documentation..."
 	rm -f $(DOC_FILES)
 
 #### Makes single-file makes easier to type