Skip to content

Commit afb34bd

Browse files
committed
Fix manpage for service
We need `-s` for the pandoc invocation to render this right. Signed-off-by: Colin Walters <[email protected]>
1 parent 99a84fa commit afb34bd

File tree

3 files changed

+16
-5
lines changed

3 files changed

+16
-5
lines changed

Makefile

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,14 @@ install:
1010
install -D -m 0755 -t $(DESTDIR)$(prefix)/bin target/release/bootc
1111
install -d $(DESTDIR)$(prefix)/lib/bootc/install
1212
# Support installing pre-generated man pages shipped in source tarball, to avoid
13-
# a dependency on pandoc downstream
14-
if test -d man; then install -D -m 0644 -t $(DESTDIR)$(prefix)/share/man/man5 man/*.5; fi
15-
if test -d man; then install -D -m 0644 -t $(DESTDIR)$(prefix)/share/man/man8 man/*.8; fi
13+
# a dependency on pandoc downstream. But in local builds these end up in target/man,
14+
# so we honor that too.
15+
for d in man target/man; do \
16+
if test -d $$d; then \
17+
install -D -m 0644 -t $(DESTDIR)$(prefix)/share/man/man5 $$d/*.5; \
18+
install -D -m 0644 -t $(DESTDIR)$(prefix)/share/man/man8 $$d/*.8; \
19+
fi; \
20+
done
1621
install -D -m 0644 -t $(DESTDIR)/$(prefix)/lib/systemd/system systemd/*.service systemd/*.timer
1722

1823
bin-archive: all

manpages-md-extra/bootc-fetch-apply-updates.service.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
% bootc-fetch-apply-updates(5)
2+
13
# NAME
24

35
bootc-fetch-apply-updates.service
@@ -17,11 +19,15 @@ project is enabled for daily updates.
1719
However, it is fully expected that different operating systems
1820
and distributions choose different defaults.
1921

20-
## Customizing updates
22+
# CUSTOMIZING UPDATES
2123

2224
Note that all three of these steps can be decoupled; they
2325
are:
2426

2527
- `bootc upgrade --check`
2628
- `bootc upgrade`
2729
- `bootc upgrade --apply`
30+
31+
# SEE ALSO
32+
33+
**bootc(1)**

xtask/src/xtask.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ fn manpages(sh: &Shell) -> Result<()> {
106106
.ok_or_else(|| anyhow!("Expected filename in {srcpath:?}"))?;
107107
cmd!(
108108
sh,
109-
"pandoc --from=markdown --to=man --output=target/man/{base_filename}.5 {srcpath}"
109+
"pandoc -s --from=markdown --to=man --output=target/man/{base_filename}.5 {srcpath}"
110110
)
111111
.run()?;
112112
}

0 commit comments

Comments
 (0)