Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b45e7441dfc25f08993266499e9e88d2d6b18e78
commit b45e7441dfc25f08993266499e9e88d2d6b18e78 Author: Miklos Vajna <vmik...@frugalware.org> Date: Wed Feb 23 12:46:51 2011 +0100 docs: get rid of unneeded custom config (use leveloffset attr instead) diff --git a/docs/Makefile b/docs/Makefile index ee16593..4d7ebe2 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -43,8 +43,8 @@ LANGS = $(shell grep '\[po4a_langs\]' po4a.cfg |sed 's/\[po4a_langs\] //') GETLANG = $(shell lang="$(shell basename `pwd`|sed 's/docs//')"; if [ -n "$$lang" ]; then echo $$lang; else echo en; fi) -MERGE = : > $(2); \ - for i in header.txt `cat $(1) |grep link:.*html |sed 's/.*:\(.*\).html\[.*/\1.txt/'`; \ +MERGE = cat header.txt > $(2); \ + for i in `cat $(1) |grep link:.*html |sed 's/.*:\(.*\).html\[.*/\1.txt/'`; \ do \ [ "$$i" = "$(2)" ] && continue; \ echo "include::$$i[]" >> $(2); \ @@ -62,7 +62,6 @@ I18NBUILD = po4a -k 0 po4a.cfg; \ sed -i 's| ../source | ../../source |' $$i/Makefile; \ sed -i 's| -maxdepth 3 | -maxdepth 4 |' $$i/Makefile; \ sed -i 's/^\(=\+\)/\n\1/' $$i/*.txt; \ - cp merge.conf $$i/; \ $(MAKE) -C $$i $(1) || exit 1; \ done @@ -99,16 +98,13 @@ images: ln -s /etc/asciidoc/images ./ %.html: %.txt - if [[ "(manual.txt|user.txt|devel.txt)" =~ "$^" ]]; then CONF="--conf-file=merge.conf"; fi; \ - asciidoc $$CONF -a toc -a numbered -a sectids -a lang=$(call GETLANG) $^ + asciidoc -a toc -a numbered -a sectids -a lang=$(call GETLANG) $^ %.text: %.txt - if [[ "(manual.txt|user.txt|devel.txt)" =~ "$^" ]]; then CONF="--conf-file=merge.conf"; fi; \ - a2x --asciidoc-opts="$$CONF" -a toc -a numbered -a sectids -f text -a lang=$(call GETLANG) $^ + a2x -a toc -a numbered -a sectids -f text -a lang=$(call GETLANG) $^ %.pdf: %.txt - if [[ "(manual.txt|user.txt|devel.txt)" =~ "$^" ]]; then CONF="--conf-file=merge.conf"; fi; \ - a2x --asciidoc-opts="$$CONF" --dblatex-opts "-P latex.output.revhistory=0" -a toc -a numbered -a sectids -f pdf -a lang=$(call GETLANG) $^ + a2x --dblatex-opts "-P latex.output.revhistory=0" -a toc -a numbered -a sectids -f pdf -a lang=$(call GETLANG) $^ %.txt: %.txt.in sed 's/@VERSION@/$(VERSION)/' $^ > $@ diff --git a/docs/header.txt.in b/docs/header.txt.in index 9ec26d2..150bf13 100644 --- a/docs/header.txt.in +++ b/docs/header.txt.in @@ -1,7 +1,9 @@ -_ Frugalware @VERSION@ Documentation += Frugalware @VERSION@ Documentation -------------------------------------------------------------------------- -Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 The Frugalware Developer Team. +Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011 The Frugalware +Developer Team. + Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.2 or any later version published by the Free Software Foundation; @@ -9,3 +11,6 @@ with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. A copy of the license is included in the section entitled "GNU Free Documentation License". -------------------------------------------------------------------------- + +:leveloffset: 1 + diff --git a/docs/merge.conf b/docs/merge.conf deleted file mode 100644 index 859764d..0000000 --- a/docs/merge.conf +++ /dev/null @@ -1,9 +0,0 @@ -[titles] -underlines="__","==","--","~~","^^" -# Single-line title patterns. -sect0=^_ +(?P<title>[\S].*?)( +_)?$ -sect1=^= +(?P<title>[\S].*?)( +=)?$ -sect2=^== +(?P<title>[\S].*?)( +==)?$ -sect3=^=== +(?P<title>[\S].*?)( +===)?$ -sect4=^==== +(?P<title>[\S].*?)( +====)?$ -blocktitle=^\.(?P<title>([^.\s].*)|(\.[^.\s].*))$ _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
