From dc16584ac2be1c097acbf8a0b2f6d412214f2a01 Mon Sep 17 00:00:00 2001
From: Ondrej Filip <feela@majklik.network.cz>
Date: Tue, 2 Jun 2009 00:28:08 +0200
Subject: [PATCH] Small change to make BIRD's IPv6 packaging easier

---
 configure.in      | 3 +++
 sysdep/config.h   | 8 ++++----
 tools/Makefile.in | 8 ++++----
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/configure.in b/configure.in
index d1b503b0..8d519fdd 100644
--- a/configure.in
+++ b/configure.in
@@ -42,11 +42,13 @@ AC_SUBST(srcdir_rel_mf)
 
 if test "$enable_ipv6" = yes ; then
 	ip=ipv6
+	SUFFIX6=6
 	if test "$with_protocols" = all ; then
 		with_protocols=bgp,pipe,rip,static
 	fi
 else
 	ip=ipv4
+	SUFFIX6=""
 	if test "$with_protocols" = all ; then
 		with_protocols=bgp,ospf,pipe,rip,static
 	fi
@@ -208,6 +210,7 @@ if test "$enable_client" = yes ; then
 fi
 AC_SUBST(CLIENT)
 AC_SUBST(CLIENT_LIBS)
+AC_SUBST(SUFFIX6)
 
 mkdir -p $objdir/sysdep
 AC_CONFIG_HEADERS([$objdir/sysdep/autoconf.h:sysdep/autoconf.h.in])
diff --git a/sysdep/config.h b/sysdep/config.h
index 47d175ba..f0a5ecc8 100644
--- a/sysdep/config.h
+++ b/sysdep/config.h
@@ -38,11 +38,11 @@ typedef u16 word;
 /* Path to configuration file */
 #ifdef IPV6
 #  ifdef DEBUGGING
-#    define PATH_CONFIG "bird-6.conf"
-#    define PATH_CONTROL_SOCKET "bird-6.ctl"
+#    define PATH_CONFIG "bird6.conf"
+#    define PATH_CONTROL_SOCKET "bird6.ctl"
 #  else
-#    define PATH_CONFIG PATH_CONFIG_DIR "/bird-6.conf"
-#    define PATH_CONTROL_SOCKET PATH_CONTROL_SOCKET_DIR "/bird-6.ctl"
+#    define PATH_CONFIG PATH_CONFIG_DIR "/bird6.conf"
+#    define PATH_CONTROL_SOCKET PATH_CONTROL_SOCKET_DIR "/bird6.ctl"
 #  endif
 #else
 #  ifdef DEBUGGING
diff --git a/tools/Makefile.in b/tools/Makefile.in
index 8b901efa..17b4db76 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -44,12 +44,12 @@ tags:
 
 install: all
 	$(INSTALL) -d $(sbindir) $(sysconfdir) $(localstatedir)
-	$(INSTALL_PROGRAM) -s $(exedir)/bird $(sbindir)/
+	$(INSTALL_PROGRAM) -s $(exedir)/bird $(sbindir)/bird@SUFFIX6@
 	if test -n "@CLIENT@" ; then								\
-		$(INSTALL_PROGRAM) -s $(exedir)/birdc $(sbindir)/ ;				\
+		$(INSTALL_PROGRAM) -s $(exedir)/birdc $(sbindir)/birdc@SUFFIX6@ ;				\
 	fi
-	if ! test -f $(sysconfdir)/bird.conf ; then						\
-		$(INSTALL_DATA) $(srcdir)/doc/bird.conf.example $(sysconfdir)/bird.conf ;	\
+	if ! test -f $(sysconfdir)/bird.@SUFFIX6@conf ; then						\
+		$(INSTALL_DATA) $(srcdir)/doc/bird.conf.example $(sysconfdir)/bird@SUFFIX6@.conf ;	\
 	else											\
 		echo "Not overwriting old bird.conf" ;						\
 	fi