build: support runstatedir configure option
https://bugzilla.gnome.org/show_bug.cgi?id=737139 [thaller@redhat.com: modified original patch]
This commit is contained in:

committed by
Thomas Haller

parent
98abf9dc30
commit
cd3c52a24d
@@ -71,12 +71,16 @@ dnl Make sha1.c happy on big endian systems
|
||||
dnl
|
||||
AC_C_BIGENDIAN
|
||||
|
||||
# Add runstatedir if not specified manually in autoconf < 2.70
|
||||
AS_IF([test -z "$runstatedir"], runstatedir="$localstatedir/run")
|
||||
AC_SUBST(runstatedir)
|
||||
|
||||
# NetworkManager paths
|
||||
AC_SUBST(nmbinary, "$sbindir/$PACKAGE", [NetworkManager binary executable])
|
||||
AC_SUBST(nmconfdir, "$sysconfdir/$PACKAGE", [NetworkManager configuration directory])
|
||||
AC_SUBST(nmdatadir, "$datadir/$PACKAGE", [NetworkManager shared data directory])
|
||||
AC_SUBST(nmstatedir, "$localstatedir/lib/$PACKAGE", [NetworkManager persistent state directory])
|
||||
AC_SUBST(nmrundir, "$localstatedir/run/$PACKAGE", [NetworkManager runtime state directory])
|
||||
AC_SUBST(nmrundir, "$runstatedir/$PACKAGE", [NetworkManager runtime state directory])
|
||||
|
||||
# Alternative configuration plugins
|
||||
AC_ARG_ENABLE(config-plugin-ibft, AS_HELP_STRING([--enable-config-plugin-ibft], [enable ibft configuration plugin]))
|
||||
|
@@ -411,6 +411,7 @@ AM_CPPFLAGS += \
|
||||
-DDATADIR=\"$(datadir)\" \
|
||||
-DLIBEXECDIR=\"$(libexecdir)\" \
|
||||
-DLOCALSTATEDIR=\"$(localstatedir)\" \
|
||||
-DRUNSTATEDIR=\"$(runstatedir)\" \
|
||||
-DSBINDIR=\"$(sbindir)\" \
|
||||
-DSYSCONFDIR=\"$(sysconfdir)\" \
|
||||
-DRUNDIR=\"$(rundir)\" \
|
||||
@@ -539,7 +540,7 @@ EXTRA_DIST = \
|
||||
$(dbusservice_DATA) \
|
||||
$(NetworkManager_DATA)
|
||||
|
||||
rundir=$(localstatedir)/run/NetworkManager
|
||||
rundir=$(runstatedir)/NetworkManager
|
||||
statedir=$(localstatedir)/lib/NetworkManager
|
||||
install-data-hook:
|
||||
$(mkinstalldirs) -m 0700 $(DESTDIR)$(rundir)
|
||||
|
@@ -332,7 +332,7 @@ dhclient_start (NMDhcpClient *client,
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
pid_file = g_strdup_printf (LOCALSTATEDIR "/run/dhclient%s-%s.pid",
|
||||
pid_file = g_strdup_printf (RUNSTATEDIR "/dhclient%s-%s.pid",
|
||||
ipv6 ? "6" : "",
|
||||
iface);
|
||||
|
||||
|
@@ -103,7 +103,7 @@ nm_dnsmasq_manager_new (const char *iface)
|
||||
|
||||
priv = NM_DNSMASQ_MANAGER_GET_PRIVATE (manager);
|
||||
priv->iface = g_strdup (iface);
|
||||
priv->pidfile = g_strdup_printf (LOCALSTATEDIR "/run/nm-dnsmasq-%s.pid", iface);
|
||||
priv->pidfile = g_strdup_printf (RUNSTATEDIR "/nm-dnsmasq-%s.pid", iface);
|
||||
|
||||
return manager;
|
||||
}
|
||||
|
Reference in New Issue
Block a user