]> git.ipfire.org Git - thirdparty/bird.git/commitdiff
Fix installation with --disable-client
authorOndrej Zajicek (work) <santiago@crfreenet.org>
Thu, 11 Oct 2018 13:03:09 +0000 (15:03 +0200)
committerOndrej Zajicek (work) <santiago@crfreenet.org>
Thu, 11 Oct 2018 13:03:09 +0000 (15:03 +0200)
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.

Makefile.in

index b755df44b21a32707635d00a9e13cc4a7d69db28..a5816cbd47c704609e28b2a3b14ad5ec7249cb7f 100644 (file)
@@ -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                                                                                    \