← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to Makefile

  • Committer: John Arbash Meinel
  • Date: 2009-07-14 15:01:19 UTC
  • mto: (4526.2.4 1.17)
  • mto: This revision was merged to the branch mainline in revision 4554.
  • Revision ID: john@arbash-meinel.com-20090714150119-mbalfuwuwhbkpn8r
instead of updating PYTHONPATH in Makefile, update generate_docs to find bzrlib.
PYTHONPATH cannot be set portably between OSes (win32 requires ';' separation, versus ':'
on other platforms.)
Rather than work out how to get platform independent Makefile, just do it in python.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
169
169
        $(wildcard $(addsuffix /*.txt, bzrlib/help_topics/en)) 
170
170
 
171
171
doc/en/user-reference/bzr_man.txt: $(MAN_DEPENDENCIES)
172
 
        PYTHONPATH=.:$$PYTHONPATH $(PYTHON) tools/generate_docs.py -o $@ rstx
 
172
        $(PYTHON) tools/generate_docs.py -o $@ rstx
173
173
 
174
174
doc/en/release-notes/NEWS.txt: NEWS
175
175
        $(PYTHON) -c "import shutil; shutil.copyfile('$<', '$@')"
176
176
 
177
177
MAN_PAGES = man1/bzr.1
178
178
man1/bzr.1: $(MAN_DEPENDENCIES)
179
 
        PYTHONPATH=.:$$PYTHONPATH $(PYTHON) tools/generate_docs.py -o $@ man
 
179
        $(PYTHON) tools/generate_docs.py -o $@ man
180
180
 
181
181
# build a png of our performance task list
182
182
#