From: Ondrej Zajicek <santiago@crfreenet.org>
Date: Tue, 29 Apr 2014 10:43:25 +0000 (+0200)
Subject: Merge commit 'bff9ce5130d16af2fd802d42bdb2bff00980c9ae' into integrated
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=50d53854f5993a662c43f95be10165fdaa002d75;p=thirdparty%2Fbird.git

Merge commit 'bff9ce5130d16af2fd802d42bdb2bff00980c9ae' into integrated

Conflicts:

	tools/Makefile.in
---

50d53854f5993a662c43f95be10165fdaa002d75
diff --cc tools/Makefile.in
index 668bc1b16,062ba9161..bc84c543e
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@@ -69,10 -69,10 +69,10 @@@ tags
  
  install: all
  	$(INSTALL) -d $(DESTDIR)/$(sbindir) $(DESTDIR)/$(sysconfdir) $(DESTDIR)/@runtimedir@
- 	$(INSTALL_PROGRAM) -s $(exedir)/bird $(DESTDIR)/$(sbindir)/bird
- 	$(INSTALL_PROGRAM) -s $(exedir)/birdcl $(DESTDIR)/$(sbindir)/birdcl
 -	$(INSTALL_PROGRAM) $(exedir)/bird $(DESTDIR)/$(sbindir)/bird@SUFFIX@
 -	$(INSTALL_PROGRAM) $(exedir)/birdcl $(DESTDIR)/$(sbindir)/birdcl@SUFFIX@
++	$(INSTALL_PROGRAM) $(exedir)/bird $(DESTDIR)/$(sbindir)/bird
++	$(INSTALL_PROGRAM) $(exedir)/birdcl $(DESTDIR)/$(sbindir)/birdcl
  	if test -n "@CLIENT@" ; then								\
- 		$(INSTALL_PROGRAM) -s $(exedir)/birdc $(DESTDIR)/$(sbindir)/birdc ;		\
 -		$(INSTALL_PROGRAM) $(exedir)/birdc $(DESTDIR)/$(sbindir)/birdc@SUFFIX@ ;	\
++		$(INSTALL_PROGRAM) $(exedir)/birdc $(DESTDIR)/$(sbindir)/birdc ;		\
  	fi
  	if ! test -f $(DESTDIR)/@CONFIG_FILE@ ; then						\
  		$(INSTALL_DATA) $(srcdir)/doc/bird.conf.example $(DESTDIR)/@CONFIG_FILE@ ;	\