Patrick Williams | 8dd6848 | 2022-10-04 07:57:18 -0500 | [diff] [blame^] | 1 | From 97012d2c38b84fffb32867fb5eeac64a93455626 Mon Sep 17 00:00:00 2001 |
| 2 | From: Ben Brown <ben@demerara.io> |
| 3 | Date: Tue, 19 Jul 2022 16:10:24 +0100 |
| 4 | Subject: [PATCH] Use standard runstatedir vs custom flag |
| 5 | |
| 6 | Upstream-Status: Backport |
| 7 | |
| 8 | --- |
| 9 | configure.ac | 11 ++--------- |
| 10 | 1 file changed, 2 insertions(+), 9 deletions(-) |
| 11 | |
| 12 | Signed-off-by: Ben Brown <ben@demerara.io> |
| 13 | Signed-off-by: Ming Liu <liu.ming50@gmail.com> |
| 14 | |
| 15 | diff --git a/configure.ac b/configure.ac |
| 16 | index 608ad02..34a2f2c 100644 |
| 17 | --- a/configure.ac |
| 18 | +++ b/configure.ac |
| 19 | @@ -140,9 +140,7 @@ if test x$enable_systemd_integration = xyes; then |
| 20 | AC_SUBST(SYSTEMD_UNIT_DIR) |
| 21 | fi |
| 22 | |
| 23 | -AC_ARG_WITH([runtimedir], |
| 24 | - AC_HELP_STRING([--with-runtimedir=DIR], [runtime data dir [LOCALSTATEDIR/run]]), |
| 25 | - [plymouthruntimedir=${withval}/plymouth], [plymouthruntimedir=""]) |
| 26 | +AC_ARG_WITH([runtimedir], [], [AC_MSG_ERROR([--with-runtimedir is obsolete, use --runstatedir instead])], []) |
| 27 | |
| 28 | AC_ARG_WITH(system-root-install, AS_HELP_STRING([--with-system-root-install],[Install client in /bin and daemon in /sbin]),with_system_root_install=${withval},with_system_root_install=no) |
| 29 | AM_CONDITIONAL(WITH_SYSTEM_ROOT_INSTALL, [test "$with_system_root_install" = yes]) |
| 30 | @@ -150,16 +148,11 @@ AM_CONDITIONAL(WITH_SYSTEM_ROOT_INSTALL, [test "$with_system_root_install" = ye |
| 31 | if test x$with_system_root_install = xyes; then |
| 32 | plymouthclientdir=/bin |
| 33 | plymouthdaemondir=/sbin |
| 34 | - if (test -z "${plymouthruntimedir}"); then |
| 35 | - plymouthruntimedir=/run/plymouth |
| 36 | - fi |
| 37 | else |
| 38 | plymouthclientdir=$bindir |
| 39 | plymouthdaemondir=$sbindir |
| 40 | - if (test -z "${plymouthruntimedir}"); then |
| 41 | - plymouthruntimedir=$localstatedir/run/plymouth |
| 42 | - fi |
| 43 | fi |
| 44 | +plymouthruntimedir=$runstatedir/plymouth |
| 45 | AC_SUBST(plymouthclientdir) |
| 46 | AC_SUBST(plymouthdaemondir) |
| 47 | AC_SUBST(plymouthruntimedir) |
| 48 | -- |
| 49 | 2.25.1 |
| 50 | |