Fixes for auto-generation of man pages

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@whitehouse.id.au>
Signed-off-by: Karl Hasselström <kha@treskal.com>

diff --git a/Documentation/.gitignore b/Documentation/.gitignore
index 32dd09d16f812d715dc28e3c4a89e227263a8fa1..c72f35c37b1d50e4ab73afe30b2391ea56a48f36 100644 (file)
--- a/Documentation/.gitignore
+++ b/Documentation/.gitignore
@@ -3,3 +3,4 @@
 *.[1-9]
 stg-*.txt
 doc.dep
 *.[1-9]
 stg-*.txt
 doc.dep

+command-list.txt

diff --git a/Documentation/Makefile b/Documentation/Makefile
index 85e9600ce3a2dcfb046a1a8055ab4cc949764a2c..165e222c102e16755bff6ea313e6fb57b69fa8ae 100644 (file)
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -1,7 +1,7 @@
 COMMANDS = $(shell ../stg-build --commands)
 COMMANDS_TXT = $(patsubst %,stg-%.txt,$(COMMANDS))
 
 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))
 
 
 DOC_HTML=$(patsubst %.txt,%.html,$(MAN1_TXT))
 


@@ -60,14 +60,14 @@ doc.dep : $(wildcard *.txt) build-docdep.perl
 -include doc.dep
 
 clean:
 -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-,,$@)) > $@
 
 
 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
        ../stg-build --cmd-list > $@
 
 %.html : %.txt

diff --git a/Documentation/stg.txt b/Documentation/stg.txt
index b4184b213be99ed83ee022deeb24f0038a11c0ac..d8f7d01b763c5c0a2a5d83c45aeaabf16bcef872 100644 (file)
--- 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[]
 
 manpages are named 'stg-<command>(1)'.
 endif::backend-docbook[]
 

-include::stg-cmd-list.txt[]
+include::command-list.txt[]

 
 CONFIGURATION MECHANISM
 -----------------------
 
 CONFIGURATION MECHANISM
 -----------------------