summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--DISTRO_PORTING2
-rw-r--r--Makefile.am4
-rw-r--r--configure.ac6
3 files changed, 6 insertions, 6 deletions
diff --git a/DISTRO_PORTING b/DISTRO_PORTING
index 99c652c774..5088fac3e8 100644
--- a/DISTRO_PORTING
+++ b/DISTRO_PORTING
@@ -8,7 +8,7 @@ HOWTO:
--with-rootprefix=
--with-sysvinit-path=
- --with-sysvrcd-path=
+ --with-sysvrcnd-path=
--with-rc-local-script-path-start=
--with-rc-local-script-path-stop=
--with-kbd-loadkeys=
diff --git a/Makefile.am b/Makefile.am
index 60c5651d4a..474110a6e5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -63,7 +63,7 @@ polkitpolicydir=$(datadir)/polkit-1/actions
bashcompletiondir=$(sysconfdir)/bash_completion.d
rpmmacrosdir=$(sysconfdir)/rpm
sysvinitdir=$(SYSTEM_SYSVINIT_PATH)
-sysvrcddir=$(SYSTEM_SYSVRCND_PATH)
+sysvrcnddir=$(SYSTEM_SYSVRCND_PATH)
varlogdir=$(localstatedir)/log
systemdstatedir=$(localstatedir)/lib/systemd
catalogstatedir=$(systemdstatedir)/catalog
@@ -4106,7 +4106,7 @@ DISTCHECK_CONFIGURE_FLAGS = \
if HAVE_SYSV_COMPAT
DISTCHECK_CONFIGURE_FLAGS += \
--with-sysvinit-path=$$dc_install_base/$(sysvinitdir) \
- --with-sysvrcnd-path=$$dc_install_base/$(sysvrcddir)
+ --with-sysvrcnd-path=$$dc_install_base/$(sysvrcnddir)
endif
if ENABLE_GTK_DOC
diff --git a/configure.ac b/configure.ac
index 2cf506cb1f..7a3cd87511 100644
--- a/configure.ac
+++ b/configure.ac
@@ -742,8 +742,8 @@ AC_ARG_WITH([sysvinit-path],
[SYSTEM_SYSVINIT_PATH="$withval"],
[])
-AC_ARG_WITH([sysvrcd-path],
- [AS_HELP_STRING([--with-sysvrcd-path=PATH],
+AC_ARG_WITH([sysvrcnd-path],
+ [AS_HELP_STRING([--with-sysvrcnd-path=PATH],
[Specify the path to the base directory for the SysV rcN.d directories])],
[SYSTEM_SYSVRCND_PATH="$withval"],
[])
@@ -753,7 +753,7 @@ if test "x${SYSTEM_SYSVINIT_PATH}" != "x" -a "x${SYSTEM_SYSVRCND_PATH}" != "x";
SYSTEM_SYSV_COMPAT="yes"
M4_DEFINES="$M4_DEFINES -DHAVE_SYSV_COMPAT"
elif test "x${SYSTEM_SYSVINIT_PATH}" != "x" -o "x${SYSTEM_SYSVRCND_PATH}" != "x"; then
- AC_MSG_ERROR([*** You need both --with-sysvinit-path=PATH and --with-sysvrcd-path=PATH to enable SysV compatibility support, or both empty to disable it.])
+ AC_MSG_ERROR([*** You need both --with-sysvinit-path=PATH and --with-sysvrcnd-path=PATH to enable SysV compatibility support, or both empty to disable it.])
else
SYSTEM_SYSV_COMPAT="no"
fi