summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOndrej Zajicek (work) <santiago@crfreenet.org>2018-10-11 15:03:09 +0200
committerOndrej Zajicek (work) <santiago@crfreenet.org>2018-10-11 15:03:09 +0200
commit01dd78f9e924cc6d7511da1ec32c8f36d357db7a (patch)
tree31614eb0fbdf56328df58c674b066f340f192079
parentaddb1bcd86885dcee559a61eb18998ae6a38b2ab (diff)
Fix installation with --disable-client
The old check assumed that @CLIENT@ does not contain birdc, which is not true in 2.0 branc. Thanks to Thomas Petazzoni for the bugreport and original patch.
-rw-r--r--Makefile.in8
1 files changed, 3 insertions, 5 deletions
diff --git a/Makefile.in b/Makefile.in
index b755df44..a5816cbd 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -184,11 +184,9 @@ cscope:
install: all
$(INSTALL) -d $(DESTDIR)/$(sbindir) $(DESTDIR)/$(sysconfdir) $(DESTDIR)/@runtimedir@
- $(INSTALL_PROGRAM) $(exedir)/bird $(DESTDIR)/$(sbindir)/bird
- $(INSTALL_PROGRAM) $(exedir)/birdcl $(DESTDIR)/$(sbindir)/birdcl
- if test -n "@CLIENT@" ; then \
- $(INSTALL_PROGRAM) $(exedir)/birdc $(DESTDIR)/$(sbindir)/birdc ; \
- fi
+ for BIN in bird @CLIENT@ ; do \
+ $(INSTALL_PROGRAM) $(exedir)/$$BIN $(DESTDIR)/$(sbindir)/$$BIN ; \
+ done
if ! test -f $(DESTDIR)/@CONFIG_FILE@ ; then \
$(INSTALL_DATA) $(srcdir)/doc/bird.conf.example $(DESTDIR)/@CONFIG_FILE@ ; \
else \