From: Ondrej Zajicek <santiago@crfreenet.org>
Date: Wed, 22 May 2013 13:58:31 +0000 (+0200)
Subject: Merge commit '568d9c9faeab70951d8e9bfea521e1b38a9a3d1c' into integrated
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8ad9bb820ff3bd64a56be5efbe07f34bc391c860;p=thirdparty%2Fbird.git

Merge commit '568d9c9faeab70951d8e9bfea521e1b38a9a3d1c' into integrated

Conflicts:

	tools/Makefile.in
---

8ad9bb820ff3bd64a56be5efbe07f34bc391c860
diff --cc tools/Makefile.in
index 182e97c96,adf35b642..59e8aba65
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@@ -57,9 -67,10 +67,10 @@@ tags
  
  install: all
  	$(INSTALL) -d $(DESTDIR)/$(sbindir) $(DESTDIR)/$(sysconfdir) $(DESTDIR)/@runtimedir@
 -	$(INSTALL_PROGRAM) -s $(exedir)/bird $(DESTDIR)/$(sbindir)/bird@SUFFIX@
 -	$(INSTALL_PROGRAM) -s $(exedir)/birdcl $(DESTDIR)/$(sbindir)/birdcl@SUFFIX@
 +	$(INSTALL_PROGRAM) -s $(exedir)/bird $(DESTDIR)/$(sbindir)/bird
++	$(INSTALL_PROGRAM) -s $(exedir)/birdcl $(DESTDIR)/$(sbindir)/birdcl
  	if test -n "@CLIENT@" ; then								\
 -		$(INSTALL_PROGRAM) -s $(exedir)/birdc $(DESTDIR)/$(sbindir)/birdc@SUFFIX@ ;	\
 +		$(INSTALL_PROGRAM) -s $(exedir)/birdc $(DESTDIR)/$(sbindir)/birdc ;		\
  	fi
  	if ! test -f $(DESTDIR)/@CONFIG_FILE@ ; then						\
  		$(INSTALL_DATA) $(srcdir)/doc/bird.conf.example $(DESTDIR)/@CONFIG_FILE@ ;	\