diff --git a/services/systemd/espeakup.conf b/services/systemd/espeakup.conf deleted file mode 100644 index 56aebc1..0000000 --- a/services/systemd/espeakup.conf +++ /dev/null @@ -1 +0,0 @@ -default_voice= diff --git a/services/systemd/espeakup.service.in b/services/systemd/espeakup.service.in index bf58905..cbec810 100644 --- a/services/systemd/espeakup.service.in +++ b/services/systemd/espeakup.service.in @@ -6,10 +6,9 @@ After=systemd-udev-settle.service sound.target [Service] Type=forking -EnvironmentFile=@sysconfdir@/conf.d/espeakup.conf PIDFile=/run/espeakup.pid ExecStartPre=+modprobe speakup_soft -ExecStart=@bindir@/espeakup --default-voice=${default_voice} +ExecStart=@bindir@/espeakup ExecReload=kill -HUP $MAINPID Restart=always diff --git a/services/systemd/meson.build b/services/systemd/meson.build index 7e4f07e..4a693ed 100644 --- a/services/systemd/meson.build +++ b/services/systemd/meson.build @@ -1,12 +1,10 @@ unitdir = systemd.get_pkgconfig_variable('systemdsystemunitdir') prefixdir = get_option('prefix') bindir = join_paths(prefixdir, get_option('bindir')) -sysconfdir = join_paths(prefixdir, get_option('sysconfdir')) unit_conf = configuration_data() unit_conf.set('bindir', bindir) -unit_conf.set('sysconfdir', sysconfdir) service_file = configure_file( input : 'espeakup.service.in', @@ -17,7 +15,3 @@ service_file = configure_file( install_data(service_file, install_dir : unitdir ) - -install_data('espeakup.conf', - install_dir : join_paths(sysconfdir, 'conf.d') -)