Patchwork [2,of,2,v2] manual generation: rename manual-txt into manual-text

login
register
mail settings
Submitter Thomas De Schampheleire
Date Sept. 21, 2013, 11:06 a.m.
Message ID <067ad8e508dd7fc0f163.1379761614@argentina>
Download mbox | patch
Permalink /patch/276856/
State Accepted
Commit 462e9915fd8115419654e43473591a0af625229c
Headers show

Comments

Thomas De Schampheleire - Sept. 21, 2013, 11:06 a.m.
The output extension and the generation messages refer to 'text', but the make
target was confusingly 'txt'. This patch changes the make target for
consistency.

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>

---
v2: fix missing rename in Makefile (thanks ThomasP)

 Makefile              |  4 ++--
 docs/manual/manual.mk |  2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
Thomas Petazzoni - Sept. 22, 2013, 8:27 a.m.
Dear Thomas De Schampheleire,

On Sat, 21 Sep 2013 13:06:54 +0200, Thomas De Schampheleire wrote:
> The output extension and the generation messages refer to 'text', but the make
> target was confusingly 'txt'. This patch changes the make target for
> consistency.
> 
> Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>

Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Samuel Martin - Sept. 22, 2013, 9:19 a.m.
2013/9/22 Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

> Dear Thomas De Schampheleire,
>
> On Sat, 21 Sep 2013 13:06:54 +0200, Thomas De Schampheleire wrote:
> > The output extension and the generation messages refer to 'text', but
> the make
> > target was confusingly 'txt'. This patch changes the make target for
> > consistency.
> >
> > Signed-off-by: Thomas De Schampheleire <
> thomas.de.schampheleire@gmail.com>
>
> Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
>
Acked-by: Samuel Martin <s.martin49@gmail.com>

Regards,

Patch

diff --git a/Makefile b/Makefile
--- a/Makefile
+++ b/Makefile
@@ -815,7 +815,7 @@  endif
 	@echo '  manual-html            - build manual in HTML'
 	@echo '  manual-split-html      - build manual in split HTML'
 	@echo '  manual-pdf             - build manual in PDF'
-	@echo '  manual-txt             - build manual in txt'
+	@echo '  manual-text            - build manual in text'
 	@echo '  manual-epub            - build manual in ePub'
 	@echo
 	@echo 'Miscellaneous:'
@@ -839,7 +839,7 @@  release: OUT=buildroot-$(BR2_VERSION)
 # documentation to the git output
 release:
 	git archive --format=tar --prefix=$(OUT)/ HEAD > $(OUT).tar
-	$(MAKE) O=$(OUT) manual-html manual-txt manual-pdf
+	$(MAKE) O=$(OUT) manual-html manual-text manual-pdf
 	tar rf $(OUT).tar $(OUT)
 	gzip -9 -c < $(OUT).tar > $(OUT).tar.gz
 	bzip2 -9 -c < $(OUT).tar > $(OUT).tar.bz2
diff --git a/docs/manual/manual.mk b/docs/manual/manual.mk
--- a/docs/manual/manual.mk
+++ b/docs/manual/manual.mk
@@ -73,7 +73,7 @@  define GENDOC
 $(call GENDOC_INNER,$(1),xhtml,html,html,HTML,--xsltproc-opts "--stringparam toc.section.depth 4")
 $(call GENDOC_INNER,$(1),chunked,split-html,chunked,split HTML,--xsltproc-opts "--stringparam toc.section.depth 4")
 $(call GENDOC_INNER,$(1),pdf,pdf,pdf,PDF,--dblatex-opts "-P latex.output.revhistory=0")
-$(call GENDOC_INNER,$(1),text,txt,text,text)
+$(call GENDOC_INNER,$(1),text,text,text,text)
 $(call GENDOC_INNER,$(1),epub,epub,epub,ePUB)
 clean: $(1)-clean
 $(1)-clean: