stg.txt is the only man page not generated by stg-build --commands. Provide this page explicitly instead of including all other commands twice. stg-cmd-list.txt is only a template for inclusion in other man pages, so rename to stop it being built along with other stg-* files. Signed-off-by: Daniel White <daniel@xxxxxxxxxxxxxxxx> --- Documentation/.gitignore | 1 + Documentation/Makefile | 6 +++--- Documentation/stg.txt | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Documentation/.gitignore b/Documentation/.gitignore index 32dd09d..c72f35c 100644 --- a/Documentation/.gitignore +++ b/Documentation/.gitignore @@ -3,3 +3,4 @@ *.[1-9] stg-*.txt doc.dep +command-list.txt diff --git a/Documentation/Makefile b/Documentation/Makefile index 85e9600..165e222 100644 --- a/Documentation/Makefile +++ b/Documentation/Makefile @@ -1,7 +1,7 @@ COMMANDS = $(shell ../stg-build --commands) COMMANDS_TXT = $(patsubst %,stg-%.txt,$(COMMANDS)) -MAN1_TXT=$(wildcard stg*.txt) $(COMMANDS_TXT) +MAN1_TXT= stg.txt $(COMMANDS_TXT) DOC_HTML=$(patsubst %.txt,%.html,$(MAN1_TXT)) @@ -60,14 +60,14 @@ doc.dep : $(wildcard *.txt) build-docdep.perl -include doc.dep clean: - rm -f *.xml *.html *.pdf *.1 doc.dep $(COMMANDS_TXT) stg-cmd-list.txt + rm -f *.xml *.html *.pdf *.1 doc.dep $(COMMANDS_TXT) command-list.txt ALL_PY = $(shell find ../stgit -name '*.py') $(COMMANDS_TXT): $(ALL_PY) ../stg-build --asciidoc $(basename $(subst stg-,,$@)) > $@ -stg-cmd-list.txt: $(ALL_PY) +command-list.txt: $(ALL_PY) ../stg-build --cmd-list > $@ %.html : %.txt diff --git a/Documentation/stg.txt b/Documentation/stg.txt index b4184b2..d8f7d01 100644 --- a/Documentation/stg.txt +++ b/Documentation/stg.txt @@ -105,7 +105,7 @@ description is available in individual command manpages. Those manpages are named 'stg-<command>(1)'. endif::backend-docbook[] -include::stg-cmd-list.txt[] +include::command-list.txt[] CONFIGURATION MECHANISM ----------------------- -- 1.6.0.1.220.g80d1 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
