Rev 4686: Change Makefile to avoid a GNUism in http://bazaar.launchpad.net/~jameinel/bzr/2.0.2-make-without-gnu

John Arbash Meinel john at arbash-meinel.com
Mon Oct 19 16:14:10 BST 2009


At http://bazaar.launchpad.net/~jameinel/bzr/2.0.2-make-without-gnu

------------------------------------------------------------
revno: 4686
revision-id: john at arbash-meinel.com-20091019151404-cfpmjik7hdhfbq3u
parent: pqm at pqm.ubuntu.com-20091015054058-rs11wsd9qbb78pcn
author: Bernhard Voelker <bernhard.voelker at siemens-enterprise.com>
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 2.0.2-make-without-gnu
timestamp: Mon 2009-10-19 10:14:04 -0500
message:
  Change Makefile to avoid a GNUism
  
  Basically change all ':=' lines into plain '=' lines.
  This means that variables will be expanded as requested, rather than expanded
  one time when they are defined.
  It makes the Makefile compatible with non-gnu 'make' programs:
    http://www.gnu.org/software/make/manual/make.html#Flavors
-------------- next part --------------
=== modified file 'Makefile'
--- a/Makefile	2009-09-09 13:21:33 +0000
+++ b/Makefile	2009-10-19 15:14:04 +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
 



More information about the bazaar-commits mailing list