From 6a10ddbc39fa8c1959ac55fd1c1945d261daf0b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Ekl=C3=B6f?= Date: Fri, 3 May 2019 22:58:22 +0200 Subject: [PATCH] meson: don't compress man pages This is up to the distribution/packager. For example, arch automatically compresses man pages. --- PKGBUILD | 4 ++-- PKGBUILD.wayland-only | 4 ++-- doc/meson.build | 8 +++----- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index e834644..ae749e7 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,11 +1,11 @@ pkgname=f00bar -pkgver=0.9.0.r200.gaaa5239 +pkgver=0.9.0.r203.g22989d6 pkgrel=1 pkgdesc="Simplistic and highly configurable status panel for X and Wayland" arch=('x86_64') url=https://gitlab.com/dnkl/f00bar license=(mit) -makedepends=('meson' 'ninja' 'scdoc' 'gzip') +makedepends=('meson' 'ninja' 'scdoc') depends=( 'libxcb' 'xcb-util' 'xcb-util-cursor' 'xcb-util-wm' 'wayland' 'wlroots' diff --git a/PKGBUILD.wayland-only b/PKGBUILD.wayland-only index 482995b..651c72c 100644 --- a/PKGBUILD.wayland-only +++ b/PKGBUILD.wayland-only @@ -1,5 +1,5 @@ pkgname=f00bar-wayland -pkgver=0.9.0.r200.gaaa5239 +pkgver=0.9.0.r203.g22989d6 pkgrel=1 pkgdesc="Simplistic and highly configurable status panel for Wayland" arch=('x86_64') @@ -7,7 +7,7 @@ url=https://gitlab.com/dnkl/f00bar license=(mit) conflicts=('f00bar') provides=('f00bar') -makedepends=('meson' 'ninja' 'scdoc' 'gzip') +makedepends=('meson' 'ninja' 'scdoc') depends=( 'wayland' 'wlroots' 'freetype2' 'fontconfig' 'cairo' diff --git a/doc/meson.build b/doc/meson.build index 9db7c01..2147d7c 100644 --- a/doc/meson.build +++ b/doc/meson.build @@ -1,7 +1,6 @@ sh = find_program('sh', native: true) scdoc = dependency('scdoc', native: true) scdoc_prog = find_program(scdoc.get_pkgconfig_variable('scdoc'), native: true) -gzip = find_program('gzip', native: true) foreach man_src : ['f00bar.1.scd', 'f00bar.5.scd', 'f00bar-decorations.5.scd', 'f00bar-modules.5.scd', 'f00bar-particles.5.scd', @@ -9,14 +8,13 @@ foreach man_src : ['f00bar.1.scd', 'f00bar.5.scd', 'f00bar-decorations.5.scd', parts = man_src.split('.') name = parts[-3] section = parts[-2] - out = '@0@.@1@.gz'.format(name, section) + out = '@0@.@1@'.format(name, section) custom_target( out, output: out, input: man_src, - command: [sh, '-c', '@0@ < @INPUT@ | @1@ > doc/@2@'.format( - scdoc_prog.path(), gzip.path(), out)], + command: [sh, '-c', '@0@ < @INPUT@ > doc/@1@'.format(scdoc_prog.path(), out)], install: true, - install_dir: '@0@/man@1@'.format(get_option('mandir'), section)) + install_dir: join_paths(get_option('mandir'), 'man@0@'.format(section))) endforeach