mirrors/bird
mirrors/bird
0
0
Fork 0
mirror of https://gitlab.nic.cz/labs/bird.git synced 2024-12-22 17:51:53 +00:00
Code Releases Activity

Configure: Use standard --runstatedir option

Browse Source 
Newer Autoconf defines --runstatedir option for setting directory for
run-time variable data. Use it instead our old --with-runtimedir.
This commit is contained in:
Ondrej Zajicek (work) 2018-12-20 13:15:53 +01:00
parent e7e3b335bf
commit 16fb28e588
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
configure.ac
View File

@ -53,9 +53,9 @@ AC_ARG_WITH([sysconfig],
) )
AC_ARG_WITH([runtimedir], AC_ARG_WITH([runtimedir],
[AS_HELP_STRING([--with-runtimedir=PATH], [path for runtime files @<:@LOCALSTATEDIR/run@:>@])], [AS_HELP_STRING([--with-runtimedir=PATH], [run-state data, obsolete variant of --runstatedir])],
[runtimedir="$with_runtimedir"], [runstatedir="$with_runtimedir"],
[runtimedir="\$(localstatedir)/run"] []
) )
AC_ARG_WITH([iproutedir], AC_ARG_WITH([iproutedir],
@ -91,7 +91,11 @@ esac
AC_SUBST([objdir]) AC_SUBST([objdir])
AC_SUBST([exedir]) AC_SUBST([exedir])
AC_SUBST([srcdir_rel_mf]) AC_SUBST([srcdir_rel_mf])
AC_SUBST([runtimedir])
# Workaround for older Autoconfs that do not define runstatedir
AS_IF([test -z "${runstatedir}"], [runstatedir='${localstatedir}/run'])
AC_SUBST([runstatedir])
if test "$enable_ipv6" = yes ; then if test "$enable_ipv6" = yes ; then
ip=ipv6 ip=ipv6
@ -112,7 +116,7 @@ if test "$enable_debug" = yes ; then
CONTROL_SOCKET="bird$SUFFIX.ctl" CONTROL_SOCKET="bird$SUFFIX.ctl"
else else
CONFIG_FILE="\$(sysconfdir)/bird$SUFFIX.conf" CONFIG_FILE="\$(sysconfdir)/bird$SUFFIX.conf"
CONTROL_SOCKET="$runtimedir/bird$SUFFIX.ctl" CONTROL_SOCKET="\$(runstatedir)/bird.ctl"
fi fi
AC_SUBST([CONFIG_FILE]) AC_SUBST([CONFIG_FILE])
AC_SUBST([CONTROL_SOCKET]) AC_SUBST([CONTROL_SOCKET])

2
tools/Makefile.in
View File

@ -71,7 +71,7 @@ tags:
cd $(srcdir) ; etags -lc `find $(static-dirs) $(addprefix $(objdir)/,$(dynamic-dirs)) $(client-dirs) -name *.[chY]` cd $(srcdir) ; etags -lc `find $(static-dirs) $(addprefix $(objdir)/,$(dynamic-dirs)) $(client-dirs) -name *.[chY]`
install: all install: all
$(INSTALL) -d $(DESTDIR)/$(sbindir) $(DESTDIR)/$(sysconfdir) $(DESTDIR)/@runtimedir@ $(INSTALL) -d $(DESTDIR)/$(sbindir) $(DESTDIR)/$(sysconfdir) $(DESTDIR)/$(runstatedir)
$(INSTALL_PROGRAM) $(exedir)/bird $(DESTDIR)/$(sbindir)/bird@SUFFIX@ $(INSTALL_PROGRAM) $(exedir)/bird $(DESTDIR)/$(sbindir)/bird@SUFFIX@
$(INSTALL_PROGRAM) $(exedir)/birdcl $(DESTDIR)/$(sbindir)/birdcl@SUFFIX@ $(INSTALL_PROGRAM) $(exedir)/birdcl $(DESTDIR)/$(sbindir)/birdcl@SUFFIX@
if test -n "@CLIENT@" ; then \ if test -n "@CLIENT@" ; then \

1
tools/Rules.in
View File

@ -39,6 +39,7 @@ bindir=@bindir@
sbindir=@sbindir@ sbindir=@sbindir@
sysconfdir=@sysconfdir@ sysconfdir=@sysconfdir@
localstatedir=@localstatedir@ localstatedir=@localstatedir@
runstatedir=@runstatedir@
docdir=@prefix@/doc docdir=@prefix@/doc
ifdef source ifdef source