Revision dc16584a

View differences:

configure.in
42 42

  
43 43
if test "$enable_ipv6" = yes ; then
44 44
	ip=ipv6
45
	SUFFIX6=6
45 46
	if test "$with_protocols" = all ; then
46 47
		with_protocols=bgp,pipe,rip,static
47 48
	fi
48 49
else
49 50
	ip=ipv4
51
	SUFFIX6=""
50 52
	if test "$with_protocols" = all ; then
51 53
		with_protocols=bgp,ospf,pipe,rip,static
52 54
	fi
......
208 210
fi
209 211
AC_SUBST(CLIENT)
210 212
AC_SUBST(CLIENT_LIBS)
213
AC_SUBST(SUFFIX6)
211 214

  
212 215
mkdir -p $objdir/sysdep
213 216
AC_CONFIG_HEADERS([$objdir/sysdep/autoconf.h:sysdep/autoconf.h.in])
sysdep/config.h
38 38
/* Path to configuration file */
39 39
#ifdef IPV6
40 40
#  ifdef DEBUGGING
41
#    define PATH_CONFIG "bird-6.conf"
42
#    define PATH_CONTROL_SOCKET "bird-6.ctl"
41
#    define PATH_CONFIG "bird6.conf"
42
#    define PATH_CONTROL_SOCKET "bird6.ctl"
43 43
#  else
44
#    define PATH_CONFIG PATH_CONFIG_DIR "/bird-6.conf"
45
#    define PATH_CONTROL_SOCKET PATH_CONTROL_SOCKET_DIR "/bird-6.ctl"
44
#    define PATH_CONFIG PATH_CONFIG_DIR "/bird6.conf"
45
#    define PATH_CONTROL_SOCKET PATH_CONTROL_SOCKET_DIR "/bird6.ctl"
46 46
#  endif
47 47
#else
48 48
#  ifdef DEBUGGING
tools/Makefile.in
44 44

  
45 45
install: all
46 46
	$(INSTALL) -d $(sbindir) $(sysconfdir) $(localstatedir)
47
	$(INSTALL_PROGRAM) -s $(exedir)/bird $(sbindir)/
47
	$(INSTALL_PROGRAM) -s $(exedir)/bird $(sbindir)/bird@SUFFIX6@
48 48
	if test -n "@CLIENT@" ; then								\
49
		$(INSTALL_PROGRAM) -s $(exedir)/birdc $(sbindir)/ ;				\
49
		$(INSTALL_PROGRAM) -s $(exedir)/birdc $(sbindir)/birdc@SUFFIX6@ ;				\
50 50
	fi
51
	if ! test -f $(sysconfdir)/bird.conf ; then						\
52
		$(INSTALL_DATA) $(srcdir)/doc/bird.conf.example $(sysconfdir)/bird.conf ;	\
51
	if ! test -f $(sysconfdir)/bird.@SUFFIX6@conf ; then						\
52
		$(INSTALL_DATA) $(srcdir)/doc/bird.conf.example $(sysconfdir)/bird@SUFFIX6@.conf ;	\
53 53
	else											\
54 54
		echo "Not overwriting old bird.conf" ;						\
55 55
	fi

Also available in: Unified diff