mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-07-23 03:05:48 +03:00
34 lines
1.3 KiB
Diff
34 lines
1.3 KiB
Diff
From: =?utf-8?b?T25kxZllaiBTdXLDvQ==?= <ondrej@sury.org>
|
|
Date: Tue, 19 Feb 2019 12:55:42 +0000
|
|
Subject: Use runstatedir for pid file location
|
|
|
|
We have to modify the autohelled Makefile.in instead of Makefile.am because Kea
|
|
requires old automake-1.15.
|
|
|
|
Patch-Source: https://sources.debian.org/src/isc-kea/1.5.0-2/debian/patches/0004-Use-runstatedir-for-pid-file-location.patch/
|
|
|
|
--- a/src/lib/process/Makefile.in
|
|
+++ b/src/lib/process/Makefile.in
|
|
@@ -487,10 +487,8 @@
|
|
top_builddir = @top_builddir@
|
|
top_srcdir = @top_srcdir@
|
|
SUBDIRS = . testutils tests
|
|
-# DATA_DIR is the directory where to put PID files.
|
|
-dhcp_data_dir = @runstatedir@/@PACKAGE@
|
|
AM_CPPFLAGS = -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib \
|
|
- -DDATA_DIR="\"$(dhcp_data_dir)\"" $(BOOST_INCLUDES)
|
|
+ -DKEA_PIDFILE_DIR="\"$(runstatedir)/$(PACKAGE_NAME)\"" $(BOOST_INCLUDES)
|
|
AM_CXXFLAGS = $(KEA_CXXFLAGS)
|
|
|
|
# Ensure that the message file is included in the distribution
|
|
--- a/src/lib/process/daemon.cc
|
|
+++ b/src/lib/process/daemon.cc
|
|
@@ -37,7 +37,7 @@
|
|
|
|
Daemon::Daemon()
|
|
: signal_set_(), signal_handler_(), config_file_(""),
|
|
- pid_file_dir_(DATA_DIR), pid_file_(), am_file_author_(false),
|
|
+ pid_file_dir_(KEA_PIDFILE_DIR), pid_file_(), am_file_author_(false),
|
|
exit_value_(EXIT_SUCCESS) {
|
|
|
|
// The pid_file_dir can be overridden via environment variable
|