diff options
author | Jim Ramsay <i.am@jimramsay.com> | 2009-02-18 01:52:35 (GMT) |
---|---|---|
committer | Jim Ramsay <i.am@jimramsay.com> | 2009-05-26 20:16:06 (GMT) |
commit | 6beb1f96b25cd4ce23395d6666aa8ea22038817e (patch) | |
tree | f7b764e1b7220b75cecb35dece73e31a4b33db6e | |
parent | bd8275b33cec5b0765b93e8905bfefcdfd994b73 (diff) | |
download | fluxbox_pavel-6beb1f96b25cd4ce23395d6666aa8ea22038817e.zip fluxbox_pavel-6beb1f96b25cd4ce23395d6666aa8ea22038817e.tar.bz2 |
Process all asciidoc-generated man pages with sed
This makes things a bit simpler and more generic.
-rw-r--r-- | doc/Makefile.am | 17 | ||||
-rw-r--r-- | doc/asciidoc/Makefile | 21 | ||||
-rw-r--r-- | doc/fluxbox-apps.5.in (renamed from doc/fluxbox-apps.5) | 0 | ||||
-rw-r--r-- | doc/fluxbox-keys.5.in (renamed from doc/fluxbox-keys.5) | 0 | ||||
-rw-r--r-- | doc/fluxbox-remote.1.in (renamed from doc/fluxbox-remote.1) | 0 |
5 files changed, 22 insertions, 16 deletions
diff --git a/doc/Makefile.am b/doc/Makefile.am index 8268fff..2e39d5b 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am | |||
@@ -2,17 +2,14 @@ | |||
2 | # Makefile.am for fluxbox/doc | 2 | # Makefile.am for fluxbox/doc |
3 | 3 | ||
4 | SUBDIRS = ru | 4 | SUBDIRS = ru |
5 | CLEANFILES = fluxbox.1 fluxbox-style.5 | 5 | CLEANFILES = fluxbox.1 fluxbox-apps.5 fluxbox-keys.5 fluxbox-remote.1 fluxbox-style.5 |
6 | MAINTAINERCLEANFILES = Makefile.in | 6 | MAINTAINERCLEANFILES = Makefile.in |
7 | man_MANS = fluxbox.1 fbsetroot.1 fbrun.1 fbsetbg.1 \ | 7 | man_MANS = fbsetroot.1 fbrun.1 fbsetbg.1 startfluxbox.1 \ |
8 | startfluxbox.1 fluxbox-style.5 fluxbox-keys.5 fluxbox-apps.5 fluxbox-remote.1 | 8 | fluxbox.1 fluxbox-apps.5 fluxbox-keys.5 fluxbox-remote.1 fluxbox-style.5 |
9 | EXTRA_DIST=fluxbox.1.in fbsetroot.1 fbrun.1 fluxbox-keys.5 fluxbox-apps.5 fluxbox-remote.1 startfluxbox.1 fbsetbg.1 \ | 9 | EXTRA_DIST=fbsetroot.1 fbrun.1 fbsetbg.1 startfluxbox.1 CODESTYLE \ |
10 | fluxbox-style.5.in CODESTYLE | 10 | fluxbox.1.in fluxbox-apps.5.in fluxbox-keys.5.in fluxbox-remote.1.in fluxbox-style.5.in |
11 | distclean-local: | 11 | distclean-local: |
12 | rm -f *\~ | 12 | rm -f *\~ |
13 | 13 | ||
14 | fluxbox.1: fluxbox.1.in | 14 | %: %.in |
15 | @regex_cmd@ -e "s,@pkgdatadir@,$(pkgdatadir)," $(srcdir)/fluxbox.1.in > fluxbox.1 | 15 | @regex_cmd@ -e "s,@pkgdatadir@,$(pkgdatadir)," $^ > $@ |
16 | |||
17 | fluxbox-style.5: fluxbox-style.5.in | ||
18 | @regex_cmd@ -e "s,@pkgdatadir@,$(pkgdatadir)," $(srcdir)/fluxbox-style.5.in > fluxbox-style.5 | ||
diff --git a/doc/asciidoc/Makefile b/doc/asciidoc/Makefile index 646d415..95c5ee9 100644 --- a/doc/asciidoc/Makefile +++ b/doc/asciidoc/Makefile | |||
@@ -2,25 +2,34 @@ | |||
2 | # create manpages from the asciidoc files | 2 | # create manpages from the asciidoc files |
3 | # | 3 | # |
4 | 4 | ||
5 | SRC1 = fluxbox.txt fluxbox-keys.txt fluxbox-remote.txt | 5 | SRC1 = fluxbox.txt fluxbox-remote.txt |
6 | SRC5 = fluxbox-keys.txt fluxbox-apps.txt fluxbox-style.txt | 6 | SRC5 = fluxbox-keys.txt fluxbox-apps.txt fluxbox-style.txt |
7 | 7 | ||
8 | MAN = $(SRC1:.txt=.1) $(SRC5:.txt=.5) | 8 | MAN = $(SRC1:.txt=.1.in) $(SRC5:.txt=.5.in) |
9 | 9 | ||
10 | all : $(MAN) | 10 | all: $(MAN) |
11 | |||
12 | install-above: all | ||
13 | cp $(MAN) ../ | ||
11 | 14 | ||
12 | clean: | 15 | clean: |
13 | rm -fv $(MAN) | 16 | rm -fv $(MAN) |
14 | 17 | ||
15 | %.xml : %.txt | ||
16 | asciidoc -b docbook -d manpage -o $@ $< | ||
17 | |||
18 | %.1 : %.xml | 18 | %.1 : %.xml |
19 | xmlto man $< | 19 | xmlto man $< |
20 | 20 | ||
21 | %.5 : %.xml | 21 | %.5 : %.xml |
22 | xmlto man $< | 22 | xmlto man $< |
23 | 23 | ||
24 | %.1.in: %.1 | ||
25 | cp $< $@ | ||
26 | |||
27 | %.5.in: %.5 | ||
28 | cp $< $@ | ||
29 | |||
30 | %.xml : %.txt | ||
31 | asciidoc -b docbook -d manpage -o $@ $< | ||
32 | |||
24 | # Dependencies: | 33 | # Dependencies: |
25 | # | 34 | # |
26 | # fluxbox-apps(5) and fluxbox-keys(5) both include client-patterns.txt | 35 | # fluxbox-apps(5) and fluxbox-keys(5) both include client-patterns.txt |
diff --git a/doc/fluxbox-apps.5 b/doc/fluxbox-apps.5.in index 8a98ccc..8a98ccc 100644 --- a/doc/fluxbox-apps.5 +++ b/doc/fluxbox-apps.5.in | |||
diff --git a/doc/fluxbox-keys.5 b/doc/fluxbox-keys.5.in index ebcdc74..ebcdc74 100644 --- a/doc/fluxbox-keys.5 +++ b/doc/fluxbox-keys.5.in | |||
diff --git a/doc/fluxbox-remote.1 b/doc/fluxbox-remote.1.in index b27e30f..b27e30f 100644 --- a/doc/fluxbox-remote.1 +++ b/doc/fluxbox-remote.1.in | |||