1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
|
From: =?utf-8?q?Ferenc_W=C3=A1gner?= <wferi@debian.org>
Date: Thu, 30 Aug 2018 21:09:14 +0200
Subject: Use --runstatedir from future Autoconf 2.70
On compat level 11 dh_auto_configure provides this option, and
Autoconf 2.69-9 already understands it (see #759647).
---
configs/Makefile.am | 2 +-
configs/shibd-debian.in | 2 +-
shibsp/Makefile.am | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/configs/Makefile.am b/configs/Makefile.am
index c66993d..fbc357b 100644
--- a/configs/Makefile.am
+++ b/configs/Makefile.am
@@ -4,7 +4,7 @@ pkglibdir = ${libdir}/@PACKAGE_NAME@
pkglogdir = ${localstatedir}/log/@PACKAGE_NAME@
pkgxmldir = $(datadir)/xml/@PACKAGE_NAME@
pkgwebdir = $(datadir)/@PACKAGE_NAME@
-pkgrundir = $(localstatedir)/run/@PACKAGE_NAME@
+pkgrundir = @runstatedir@/@PACKAGE_NAME@
pkgcachedir = $(localstatedir)/cache/@PACKAGE_NAME@
pkgsysconfdir = $(sysconfdir)/@PACKAGE_NAME@
pkgsysconf_DATA = \
diff --git a/configs/shibd-debian.in b/configs/shibd-debian.in
index 92bb232..1d7a7cf 100644
--- a/configs/shibd-debian.in
+++ b/configs/shibd-debian.in
@@ -59,7 +59,7 @@ DAEMON_OPTS="$DAEMON_OPTS -w $SHIBD_WAIT"
. /lib/lsb/init-functions
prepare_environment () {
- # Ensure @-PKGRUNDIR-@ exists. /var/run may be on a tmpfs file system.
+ # Ensure @-PKGRUNDIR-@ exists. It may be on a tmpfs file system.
[ -d '@-PKGRUNDIR-@' ] || mkdir -p '@-PKGRUNDIR-@'
# If $DAEMON_USER is set, try to run shibd as that user. However,
diff --git a/shibsp/Makefile.am b/shibsp/Makefile.am
index 70d9d3e..61903de 100644
--- a/shibsp/Makefile.am
+++ b/shibsp/Makefile.am
@@ -282,7 +282,7 @@ libshibsp_lite_la_LIBADD = \
pkgsysconfdir = $(sysconfdir)/@PACKAGE_NAME@
pkgxmldir = $(datadir)/xml/@PACKAGE_NAME@
logdir = ${localstatedir}/log
-rundir = $(localstatedir)/run
+rundir = @runstatedir@
cachedir = $(localstatedir)/cache
xmldir = $(datadir)/xml
|
