diff options
| author | David Härdeman <david@hardeman.nu> | 2020-07-12 11:44:46 +0200 |
|---|---|---|
| committer | David Härdeman <david@hardeman.nu> | 2020-07-12 11:44:46 +0200 |
| commit | 6db27716de7227fbd9c08a85d7ee9eeb38d17f74 (patch) | |
| tree | e5bd49ec789e1d4cd5424eb1441ff2b8af3f0774 | |
| parent | 5b80fdd91ef48c114b6d87b826014466cefc5d03 (diff) | |
Some minor fixes
| -rw-r--r-- | config.h.in | 2 | ||||
| -rw-r--r-- | meson.build | 5 | ||||
| -rw-r--r-- | minecctl/misc-commands.c | 1 |
3 files changed, 5 insertions, 3 deletions
diff --git a/config.h.in b/config.h.in index 19fdccd..e9bb485 100644 --- a/config.h.in +++ b/config.h.in @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: GPL-2.0 */ -/* Autogenerated */ +/* Autogenerated from config.h.in */ #pragma once diff --git a/meson.build b/meson.build index ffa2eca..725aba8 100644 --- a/meson.build +++ b/meson.build @@ -6,6 +6,7 @@ project('minecproxy', default_options : [ 'c_std=gnu18', 'sysconfdir=/etc', + 'sharedstatedir=/var/lib', 'warning_level=2', 'b_lto=true', ] @@ -38,8 +39,8 @@ ld_extra_flags = [ ld_flags += cc.get_supported_link_arguments(ld_extra_flags) add_project_link_arguments(ld_flags, language: 'c') -sysconfdir = join_paths(get_option('prefix'), get_option('sysconfdir'), meson.project_name()) -localstatedir = join_paths(get_option('prefix'), get_option('localstatedir'), meson.project_name()) +sysconfdir = join_paths(get_option('sysconfdir'), meson.project_name()) +localstatedir = join_paths(get_option('prefix'), get_option('sharedstatedir'), meson.project_name()) mainconfname = meson.project_name() + '.conf' conf = configuration_data() diff --git a/minecctl/misc-commands.c b/minecctl/misc-commands.c index 34dd990..db9b937 100644 --- a/minecctl/misc-commands.c +++ b/minecctl/misc-commands.c @@ -701,6 +701,7 @@ static bool do_one_status(struct cfg *cfg, struct server *server) ansi_red, ansi_normal, error); rv = false; } + info(""); return rv; } |