From: Daniel White Date: Fri, 25 Jul 2008 16:11:41 +0000 (+1000) Subject: Remove variables regarding section 7 man pages X-Git-Tag: v0.15-rc1~180 X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/stgit/commitdiff_plain/bd1f46edab3496bf1da9dd3c09b5e6b043d44c37?hp=29a8a0c94fb61b2a907afd9a9684cff058b9498a Remove variables regarding section 7 man pages Documentation/Makefile originally had stg.txt in section 7, but this was changed in 36043cd62481bce58d032d06e5e79cae0ec84749. Now section 7 is no longer used and the lack of files breaks the install target. It seems simpler to remove this section until it is actually required. Signed-off-by: Daniel White --- diff --git a/Documentation/Makefile b/Documentation/Makefile index 2e5d23c..a7e0f44 100644 --- a/Documentation/Makefile +++ b/Documentation/Makefile @@ -1,7 +1,6 @@ MAN1_TXT=$(wildcard stg*.txt) -MAN7_TXT= -DOC_HTML=$(patsubst %.txt,%.html,$(MAN1_TXT) $(MAN7_TXT)) +DOC_HTML=$(patsubst %.txt,%.html,$(MAN1_TXT)) ARTICLES = # with their own formatting rules. @@ -11,12 +10,10 @@ DOC_HTML += $(patsubst %,%.html,$(ARTICLES) $(SP_ARTICLES)) DOC_PDF += $(patsubst %,%.pdf,$(ARTICLES) $(SP_ARTICLES)) DOC_MAN1=$(patsubst %.txt,%.1,$(MAN1_TXT)) -DOC_MAN7=$(patsubst %.txt,%.7,$(MAN7_TXT)) prefix?=$(HOME) mandir?=$(prefix)/man man1dir=$(mandir)/man1 -man7dir=$(mandir)/man7 # DESTDIR= ASCIIDOC=asciidoc --unsafe @@ -37,16 +34,13 @@ all: html man html: $(DOC_HTML) pdf: $(DOC_PDF) -$(DOC_HTML) $(DOC_MAN1) $(DOC_MAN7): asciidoc.conf +$(DOC_HTML) $(DOC_MAN1): asciidoc.conf -man: man1 man7 +man: man1 man1: $(DOC_MAN1) -man7: $(DOC_MAN7) - install: man - $(INSTALL) -d -m755 $(DESTDIR)$(man1dir) $(DESTDIR)$(man7dir) + $(INSTALL) -d -m755 $(DESTDIR)$(man1dir) $(INSTALL) -m644 $(DOC_MAN1) $(DESTDIR)$(man1dir) - $(INSTALL) -m644 $(DOC_MAN7) $(DESTDIR)$(man7dir) # # Determine "include::" file references in asciidoc files. # @@ -58,12 +52,12 @@ doc.dep : $(wildcard *.txt) build-docdep.perl -include doc.dep clean: - rm -f *.xml *.html *.pdf *.1 *.7 doc.dep + rm -f *.xml *.html *.pdf *.1 doc.dep %.html : %.txt $(ASCIIDOC) -b xhtml11 -d manpage -f asciidoc.conf $(ASCIIDOC_EXTRA) $< -%.1 %.7 : %.xml +%.1 : %.xml xmlto -m callouts.xsl man $< %.xml : %.txt