Polished Makefile.doc anD Makefile.common.

(includes a more elegant fix for 1e4369cb40de23bd912bb7b5175c6cfae4e665c2)

common/Makefile.common

@@ -34,6 +34,7 @@ RDF_IN        = $(RDF).in
 BUILD_DIR     = build.$(VERSION).$(OS)
 
 ASCIIDOC = asciidoc
+AWK = awk
 
 .SILENT:
 
@@ -41,11 +42,9 @@ ASCIIDOC = asciidoc
 
 TARGETS = all help info doc jar xpi install clean distclean $(JAR)
 $(TARGETS:%=\%.%):
-	echo MAKE $* $(@:$*.%=%)
+	echo "  MAKE" $* $(@:$*.%=%)
 	$(MAKE) -C $* $(@:$*.%=%)
 
-#$(TARGETS): %: $(LOCALES:%=%.%)
-
 .PHONY: $(TARGETS)
 all: help
 
@@ -75,39 +74,36 @@ jar: $(JAR)
 release: $(XPI) $(RDF)
 
 $(RDF): $(RDF_IN) Makefile
-	@echo "Preparing release..."
+	@echo "  Preparing release..."
 	$(SED) -e "s,###VERSION###,$(VERSION),g" \
 	           -e "s,###DATE###,$(BUILD_DATE),g" \
 	           < $< > $@
-	@echo "SUCCESS: $@"
+	@echo "  SUCCESS: $@"
 
-clean:
-	@echo "General $(NAME) cleanup..."
-	@set -e; for locale in $(LOCALES); do $(MAKE) -C $$locale clean; done
+clean: $(LOCALES:%=%.clean)
+	@echo "  General $(NAME) cleanup..."
 	rm -f $(JAR) $(XPI)
 
-distclean: clean
-	@echo "More $(NAME) cleanup..."
-	@set -e; for locale in $(LOCALES); do $(MAKE) -C $$locale distclean; done
+distclean: $(LOCALES:%=%.distclean) clean
+	@echo "  More $(NAME) cleanup..."
 	rm -rf $(BUILD_DIR)
 
 #### xpi
 
 $(XPI): $(JAR)
-	@echo "Building XPI..."
+	@echo "  Building XPI..."
 	mkdir -p $(XPI_PATH)
-	awk -v 'name=$(NAME)' -f $(BASE)/process_manifest.awk $(TOP)/chrome.manifest >$(XPI_PATH)/chrome.manifest
+	$(AWK) -v 'name=$(NAME)' -f $(BASE)/process_manifest.awk $(TOP)/chrome.manifest >$(XPI_PATH)/chrome.manifest
 	$(MAKE_JAR) "$(XPI)" "$(XPI_BASES)" "$(XPI_DIRS)" "$(XPI_TEXTS)" "$(XPI_BINS)" "$(XPI_FILES)"
-	@echo "SUCCESS: $@"
+	@echo "  SUCCESS: $@"
 
 #### jar
 
 $(JAR): doc
-	@echo "Building JAR..."
+	@echo "  Building JAR..."
 	$(MAKE_JAR) "$(JAR)" "$(JAR_BASES)" "$(JAR_DIRS)" "$(JAR_TEXTS)" "$(JAR_BINS)" "$(JAR_FILES)"
-	@echo "SUCCESS: $@"
+	@echo "  SUCCESS: $@"
 
 #### doc (see Makefile.doc)
 
-doc:
-	@set -e; for locale in $(LOCALES); do $(MAKE) -C $$locale doc; done
+doc: $(LOCALES:%=%.doc) ;

common/Makefile.doc

@@ -51,6 +51,6 @@ check-asciidoc:
 		echo >&2 "Warning: asciidoc versions other than 8.2.x are unsupported"
 
 $(ADC_FILES): %.html: %.txt $(BASE)/Makefile.doc $(ADC_DEPS)
-	@echo "DOC locale/$(LOCALE)/$@"
+	@echo "    DOC locale/$(LOCALE)/$@"
 	$(ASCIIDOC) --unsafe -a linkcss -a quirks! -a lang=$(LANG) -a doctitle="$(shell basename $@)" -o $@ $<