Merge lp:~jameinel/bzr/2.0.2-make-without-gnu into lp:bzr/2.0

[John A Meinel]

[John A Meinel (jameinel)]

This change was made by Bernhard Voelker. I'm not sure what system he was compiling on, but it seems that the default 'make' is not GNU Make. Which means that 'simply expanded variables' (aka :=) was not supported.

This is the GNU documentation that I could find:
  http://www.gnu.org/software/make/manual/make.html#Flavors

I'm not 100% sure if we want to take this patch or not. On the one hand, if it doesn't cause us much overhead to support more than GNU Make, it seems reasonable. Reading the documentation, having to re-expand $(wildcard) substitutions on every reference (rather than at definition time) seems a bit unfortunate.

I don't think it is a correctness thing, so I'm willing to put it up for review.

Thoughts?

[Ian Clatworthy (ian-clatworthy)]

It's been 15 years since I last looked/cared about the nuances of Makefile syntax so take my vote very lightly. From a risk perspective though, these changes only impact the doc (and one BUILDOUT setting) and look safe enough to a naive reviewer like me.

review: Approve

[Robert Collins (lifeless)]

 review approve
 merge approve

John: This change is fine, variables will be evaluated once; it changes
from immediate to lazy is all.

-Rob

review: Approve

=== modified file 'Makefile'
--- Makefile	2009-09-09 13:21:33 +0000
+++ Makefile	2009-10-19 15:20:25 +0000
@@ -174,7 +174,7 @@
 ### Documentation Website ###
 
 # Where to build the website
-DOC_WEBSITE_BUILD := build_doc_website
+DOC_WEBSITE_BUILD = build_doc_website
 
 # Build and package docs into a website, complete with downloads.
 doc-website: html-sphinx pdf-sphinx
@@ -190,13 +190,13 @@
 # support our "plain" html documentation so that Sphinx is not a hard
 # dependency for packagers on older platforms.
 
-rst2html := $(PYTHON) tools/rst2html.py --link-stylesheet --footnote-references=superscript --halt=warning
+rst2html = $(PYTHON) tools/rst2html.py --link-stylesheet --footnote-references=superscript --halt=warning
 
 # translate txt docs to html
-derived_txt_files := \
+derived_txt_files = \
 	doc/en/user-reference/bzr_man.txt \
 	doc/en/release-notes/NEWS.txt
-txt_all := \
+txt_all = \
 	doc/en/tutorials/tutorial.txt \
 	doc/en/tutorials/using_bazaar_with_launchpad.txt \
 	doc/en/tutorials/centralized_workflow.txt \
@@ -209,14 +209,14 @@
 	doc/en/upgrade-guide/index.txt \
 	doc/index.txt \
 	$(wildcard doc/index.*.txt)
-txt_nohtml := \
+txt_nohtml = \
 	doc/en/user-guide/index.txt \
 	doc/es/user-guide/index.txt \
 	doc/ru/user-guide/index.txt
-txt_files := $(filter-out $(txt_nohtml), $(txt_all))
-htm_files := $(patsubst %.txt, %.html, $(txt_files)) 
+txt_files = $(filter-out $(txt_nohtml), $(txt_all))
+htm_files = $(patsubst %.txt, %.html, $(txt_files)) 
 
-non_txt_files := \
+non_txt_files = \
        doc/default.css \
        $(wildcard doc/*/bzr-en-quick-reference.svg) \
        $(wildcard doc/*/bzr-en-quick-reference.png) \
@@ -231,7 +231,7 @@
 
 # doc/developers/*.txt files that should *not* be individually
 # converted to HTML
-dev_txt_nohtml := \
+dev_txt_nohtml = \
 	doc/developers/add.txt \
 	doc/developers/annotate.txt \
 	doc/developers/bundle-creation.txt \
@@ -257,9 +257,9 @@
 	doc/developers/status.txt \
 	doc/developers/uncommit.txt
 
-dev_txt_all := $(wildcard $(addsuffix /*.txt, doc/developers))
-dev_txt_files := $(filter-out $(dev_txt_nohtml), $(dev_txt_all))
-dev_htm_files := $(patsubst %.txt, %.html, $(dev_txt_files)) 
+dev_txt_all = $(wildcard $(addsuffix /*.txt, doc/developers))
+dev_txt_files = $(filter-out $(dev_txt_nohtml), $(dev_txt_all))
+dev_htm_files = $(patsubst %.txt, %.html, $(dev_txt_files)) 
 
 doc/en/user-guide/index-plain.html: $(wildcard $(addsuffix /*.txt, doc/en/user-guide)) 
 	$(rst2html) --stylesheet=../../default.css $(dir $@)index-plain.txt $@
@@ -301,7 +301,7 @@
 docs-plain: $(ALL_DOCS)
 
 # produce a tree containing just the final docs, ready for uploading to the web
-HTMLDIR := html_docs
+HTMLDIR = html_docs
 html-plain: docs-plain
 	$(PYTHON) tools/win32/ostools.py copytree $(WEB_DOCS) $(HTMLDIR)
 
@@ -327,7 +327,7 @@
 # These are files that need to be copied into the build location to boostrap
 # the build process.
 # Note that the path is relative to tools/win32
-BUILDOUT_FILES := buildout.cfg \
+BUILDOUT_FILES = buildout.cfg \
 	buildout-templates/bin/build-installer.bat.in \
 	ostools.py bootstrap.py