diff options
author | Kelvin M. Klann <kmk3.code@protonmail.com> | 2023-07-12 01:55:07 -0300 |
---|---|---|
committer | Kelvin M. Klann <kmk3.code@protonmail.com> | 2023-07-13 11:43:53 -0300 |
commit | 76bd5ad0f8347bc111c30f67b2eb151c2e5870ed (patch) | |
tree | 3fd235c83d6ce45451abc80dca27420203d3aad6 /src/man | |
parent | build: restore seccomp filter targets (diff) | |
download | firejail-76bd5ad0f8347bc111c30f67b2eb151c2e5870ed.tar.gz firejail-76bd5ad0f8347bc111c30f67b2eb151c2e5870ed.tar.zst firejail-76bd5ad0f8347bc111c30f67b2eb151c2e5870ed.zip |
build: simplify code related to man pages
Simplify the main targets and use wildcards instead of repeating the
filenames manually.
Also, restore the `man` target and building only when `HAVE_MAN` is
enabled.
Note: Make automatically removes intermediate files (.1 and .5), so in
general only the .gz files have to be cleaned.
Commands used to rename the man pages:
cd src/man
git mv firecfg.txt firecfg.1.in
git mv firejail-login.txt firejail-login.5.in
git mv firejail-profile.txt firejail-profile.5.in
git mv firejail-users.txt firejail-users.5.in
git mv firejail.txt firejail.1.in
git mv firemon.txt firemon.1.in
git mv jailcheck.txt jailcheck.1.in
This is kind of a follow-up to commit 9e206b7f2 ("rework src/man
Makefile", 2023-07-07).
Diffstat (limited to 'src/man')
-rw-r--r-- | src/man/Makefile | 59 | ||||
-rw-r--r-- | src/man/firecfg.1.in (renamed from src/man/firecfg.txt) | 0 | ||||
-rw-r--r-- | src/man/firejail-login.5.in (renamed from src/man/firejail-login.txt) | 0 | ||||
-rw-r--r-- | src/man/firejail-profile.5.in (renamed from src/man/firejail-profile.txt) | 0 | ||||
-rw-r--r-- | src/man/firejail-users.5.in (renamed from src/man/firejail-users.txt) | 0 | ||||
-rw-r--r-- | src/man/firejail.1.in (renamed from src/man/firejail.txt) | 0 | ||||
-rw-r--r-- | src/man/firemon.1.in (renamed from src/man/firemon.txt) | 0 | ||||
-rw-r--r-- | src/man/jailcheck.1.in (renamed from src/man/jailcheck.txt) | 0 | ||||
-rwxr-xr-x | src/man/mkman.sh | 8 |
9 files changed, 25 insertions, 42 deletions
diff --git a/src/man/Makefile b/src/man/Makefile index 1c0d94244..526ed7fcb 100644 --- a/src/man/Makefile +++ b/src/man/Makefile | |||
@@ -2,44 +2,25 @@ | |||
2 | ROOT = ../.. | 2 | ROOT = ../.. |
3 | -include $(ROOT)/config.mk | 3 | -include $(ROOT)/config.mk |
4 | 4 | ||
5 | all: firecfg.1.gz firejail.1.gz firejail-login.5.gz firejail-users.5.gz firejail-profile.5.gz firemon.1.gz jailcheck.1.gz | 5 | MOD_DIR := $(ROOT)/src/man |
6 | 6 | MANPAGES_IN := $(sort $(wildcard $(MOD_DIR)/*.in)) | |
7 | #firecfg.1.gz: firecfg.txt | 7 | MANPAGES_GZ := $(MANPAGES_IN:.in=.gz) |
8 | # gawk -f ./preproc.awk -- $(MANFLAGS) < $< > firecfg.1 | 8 | TARGET = $(MANPAGES_GZ) |
9 | # ./mkman.sh $(VERSION) firecfg.1 | 9 | |
10 | # gzip -n9 firecfg.1 | 10 | .PHONY: all |
11 | 11 | all: $(TARGET) | |
12 | # a small function to build a manpage | 12 | |
13 | define build | 13 | # foo.1: foo.1.in |
14 | gawk -f ./preproc.awk -- $(MANFLAGS) < $1 > $2 | 14 | $(MOD_DIR)/%: $(MOD_DIR)/%.in $(ROOT)/config.mk |
15 | ./mkman.sh $(VERSION) ./$2 | 15 | @printf 'Generating %s from %s\n' $@ $< |
16 | rm -f $2.gz | 16 | @gawk -f $(MOD_DIR)/preproc.awk -- $(MANFLAGS) <$< | \ |
17 | gzip -n9 $2 | 17 | $(MOD_DIR)/mkman.sh $(VERSION) >$@ |
18 | endef | 18 | |
19 | 19 | # foo.1.gz: foo.1 | |
20 | firecfg.1.gz: firecfg.txt | 20 | $(MOD_DIR)/%.gz: $(MOD_DIR)/% |
21 | $(call build,firecfg.txt,firecfg.1) | 21 | @printf 'Generating %s from %s\n' $@ $< |
22 | 22 | @rm -f $@ | |
23 | firejail.1.gz: firejail.txt | 23 | @gzip -n9 $< |
24 | $(call build,firejail.txt,firejail.1) | ||
25 | |||
26 | firejail-login.5.gz: firejail-login.txt | ||
27 | $(call build,firejail-login.txt,firejail-login.5) | ||
28 | |||
29 | firejail-users.5.gz: firejail-users.txt | ||
30 | $(call build,firejail-users.txt,firejail-users.5) | ||
31 | |||
32 | firejail-profile.5.gz: firejail-profile.txt | ||
33 | $(call build,firejail-profile.txt,firejail-profile.5) | ||
34 | |||
35 | firemon.1.gz: firemon.txt | ||
36 | $(call build,firemon.txt,firemon.1) | ||
37 | |||
38 | jailcheck.1.gz: jailcheck.txt | ||
39 | $(call build,jailcheck.txt,jailcheck.1) | ||
40 | 24 | ||
41 | .PHONY: clean | 25 | .PHONY: clean |
42 | clean:; rm -fr *.1 *.5 *.gz | 26 | clean:; rm -f *.1 *.5 *.gz |
43 | |||
44 | .PHONY: distclean | ||
45 | distclean: clean | ||
diff --git a/src/man/firecfg.txt b/src/man/firecfg.1.in index 42add6a41..42add6a41 100644 --- a/src/man/firecfg.txt +++ b/src/man/firecfg.1.in | |||
diff --git a/src/man/firejail-login.txt b/src/man/firejail-login.5.in index f03fc3c37..f03fc3c37 100644 --- a/src/man/firejail-login.txt +++ b/src/man/firejail-login.5.in | |||
diff --git a/src/man/firejail-profile.txt b/src/man/firejail-profile.5.in index fa294d888..fa294d888 100644 --- a/src/man/firejail-profile.txt +++ b/src/man/firejail-profile.5.in | |||
diff --git a/src/man/firejail-users.txt b/src/man/firejail-users.5.in index 7aa151680..7aa151680 100644 --- a/src/man/firejail-users.txt +++ b/src/man/firejail-users.5.in | |||
diff --git a/src/man/firejail.txt b/src/man/firejail.1.in index 19fc94ebd..19fc94ebd 100644 --- a/src/man/firejail.txt +++ b/src/man/firejail.1.in | |||
diff --git a/src/man/firemon.txt b/src/man/firemon.1.in index fb0cf1175..fb0cf1175 100644 --- a/src/man/firemon.txt +++ b/src/man/firemon.1.in | |||
diff --git a/src/man/jailcheck.txt b/src/man/jailcheck.1.in index e889ea91b..e889ea91b 100644 --- a/src/man/jailcheck.txt +++ b/src/man/jailcheck.1.in | |||
diff --git a/src/man/mkman.sh b/src/man/mkman.sh index b538b0126..0302e0778 100755 --- a/src/man/mkman.sh +++ b/src/man/mkman.sh | |||
@@ -5,8 +5,10 @@ | |||
5 | 5 | ||
6 | set -e | 6 | set -e |
7 | 7 | ||
8 | sed -i "s/VERSION/$1/g" "$2" | ||
9 | MONTH="$(LC_ALL=C date -u --date="@${SOURCE_DATE_EPOCH:-$(date +%s)}" +%b)" | 8 | MONTH="$(LC_ALL=C date -u --date="@${SOURCE_DATE_EPOCH:-$(date +%s)}" +%b)" |
10 | sed -i "s/MONTH/$MONTH/g" "$2" | ||
11 | YEAR="$(LC_ALL=C date -u --date="@${SOURCE_DATE_EPOCH:-$(date +%s)}" +%Y)" | 9 | YEAR="$(LC_ALL=C date -u --date="@${SOURCE_DATE_EPOCH:-$(date +%s)}" +%Y)" |
12 | sed -i "s/YEAR/$YEAR/g" "$2" | 10 | |
11 | sed \ | ||
12 | -e "s/VERSION/$1/g" \ | ||
13 | -e "s/MONTH/$MONTH/g" \ | ||
14 | -e "s/YEAR/$YEAR/g" | ||