Skip to content

Commit 32e377c

Browse files
committed
Fix macro-substitution in manual pages
1 parent 5c8a6dc commit 32e377c

12 files changed

Lines changed: 70 additions & 16 deletions
File renamed without changes.

man/de/meson.build

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,20 @@
1-
install_man('davfs2.conf.5',
2-
'mount.davfs.8',
3-
'umount.davfs.8',
4-
locale : 'de'
1+
configure_file(
2+
input : 'davfs2.conf.5.in.po',
3+
output : 'davfs2.conf.5',
4+
configuration : mandata,
5+
install_dir: mandir + '/de/man5',
6+
)
7+
8+
configure_file(
9+
input : 'mount.davfs.8.in.po',
10+
output : 'mount.davfs.8',
11+
configuration : mandata,
12+
install_dir: mandir + '/de/man8',
13+
)
14+
15+
configure_file(
16+
input : 'umount.davfs.8.in.po',
17+
output : 'umount.davfs.8',
18+
configuration : mandata,
19+
install_dir: mandir + '/de/man8',
520
)

man/es/meson.build

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1-
install_man('davfs2.conf.5',
2-
locale : 'es'
1+
configure_file(
2+
input : 'davfs2.conf.5.in.po',
3+
output : 'davfs2.conf.5',
4+
configuration : mandata,
5+
install_dir: mandir + '/es/man5',
36
)

man/meson.build

Lines changed: 38 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,41 @@
1-
install_man('davfs2.conf.5',
2-
'mount.davfs.8',
3-
'umount.davfs.8'
1+
mandata = configuration_data()
2+
3+
mandata.set_quoted('PACKAGE', cdata.get('PACKAGE'))
4+
5+
mandata.set_quoted('PACKAGE_STRING', cdata.get('PACKAGE_STRING'))
6+
mandata.set_quoted('PROGRAM_NAME', cdata.get('PROGRAM_NAME'))
7+
mandata.set_quoted('PACKAGE_BUGREPORT', cdata.get('PACKAGE_BUGREPORT'))
8+
9+
mandata.set_quoted('USER', get_option('dav_user'))
10+
mandata.set_quoted('GROUP', get_option('dav_group'))
11+
mandata.set_quoted('SYS_CONF_DIR', davfs2_sysconfdir)
12+
mandata.set_quoted('SYS_RUN', davfs2_localstatedir)
13+
mandata.set_quoted('SYS_CACHE_DIR', get_option('cachedir'))
14+
mandata.set_quoted('CONFIGFILE', 'davfs2.conf')
15+
mandata.set_quoted('SECRETSFILE', 'secrets')
16+
mandata.set_quoted('CERTS_DIR', 'certs')
17+
mandata.set_quoted('CLICERTS_DIR', 'private')
18+
19+
20+
configure_file(
21+
input : 'davfs2.conf.5.in',
22+
output : 'davfs2.conf.5',
23+
configuration : mandata,
24+
install_dir: mandir + '/man5',
25+
)
26+
27+
configure_file(
28+
input : 'mount.davfs.8.in',
29+
output : 'mount.davfs.8',
30+
configuration : mandata,
31+
install_dir: mandir + '/man8',
32+
)
33+
34+
configure_file(
35+
input : 'umount.davfs.8.in',
36+
output : 'umount.davfs.8',
37+
configuration : mandata,
38+
install_dir: mandir + '/man8',
439
)
540

641
run_command('po4a', 'po4a.conf', check:true)
File renamed without changes.

man/po4a.conf

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,16 @@
1818
# It should be named after the man page with extension
1919
# .translator. Additional addendum files may be added.
2020

21-
[type:man] davfs2.conf.5 \
22-
de:de/davfs2.conf.5 add_de:de/davfs2.conf.5.translator \
23-
es:es/davfs2.conf.5 \
21+
[type:man] davfs2.conf.5.in \
22+
de:de/davfs2.conf.5.in add_de:de/davfs2.conf.5.translator \
23+
es:es/davfs2.conf.5.in \
2424
opt_de:"-L UTF-8 -A UTF-8" \
2525
opt_es:"-k 60 -L UTF-8"
2626

27-
[type:man] mount.davfs.8 \
28-
de:de/mount.davfs.8 add_de:de/mount.davfs.8.translator \
27+
[type:man] mount.davfs.8.in \
28+
de:de/mount.davfs.8.in add_de:de/mount.davfs.8.translator \
2929
opt_de:"-L UTF-8 -A UTF-8"
3030

31-
[type:man] umount.davfs.8 \
32-
de:de/umount.davfs.8 add_de:de/umount.davfs.8.translator \
31+
[type:man] umount.davfs.8.in \
32+
de:de/umount.davfs.8.in add_de:de/umount.davfs.8.translator \
3333
opt_de:"-L UTF-8 -A UTF-8"

0 commit comments

Comments
 (0)