← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to Makefile

merge Alex's changes to support Windows installer and use bzrlib/help for topics

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
87
87
txt_files := $(wildcard $(addsuffix /*.txt, $(doc_dir))) $(derived_txt_files) \
88
88
        doc/en/user-guide/index.txt \
89
89
        doc/en/mini-tutorial/index.txt \
90
 
        doc/en/user-reference/hooks.txt \
91
90
        doc/index.txt
92
91
non_txt_files := \
93
92
       doc/default.css \
119
118
                 generate_docs.py \
120
119
                 tools/doc_generate/__init__.py \
121
120
                 tools/doc_generate/autodoc_man.py \
122
 
                 tools/doc_generate/autodoc_rstx.py
 
121
                 tools/doc_generate/autodoc_rstx.py \
 
122
                 $(wildcard $(addsuffix /*.txt, bzrlib/help)) 
123
123
 
124
124
doc/en/user-reference/bzr_man.txt: $(MAN_DEPENDENCIES)
125
125
        $(PYTHON) generate_docs.py -o $@ rstx