[PATCH 2.x branch] Makefile.in: fix installation with --disable-client

Thomas Petazzoni thomas.petazzoni at bootlin.com
Tue Oct 9 14:03:16 CEST 2018


The configure.ac script initializes the CLIENT variable this way:

CLIENT=birdcl
if client enabled
 CLIENT=$CLIENT birdc
fi

This means that checking if @CLIENT@ is empty to decide whether birdc
should be installed or not doesn't work, and causes a failure at
installation time when --disable-client is passed.

Instead, check if the birdc binary has been produced or not to decide
whether it should be installed.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni at bootlin.com>
---
 Makefile.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile.in b/Makefile.in
index c8168bbe..fea3683e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -171,7 +171,7 @@ 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								\
+	if test -f $(exedir)/birdc ; then							\
 		$(INSTALL_PROGRAM) $(exedir)/birdc $(DESTDIR)/$(sbindir)/birdc ;		\
 	fi
 	if ! test -f $(DESTDIR)/@CONFIG_FILE@ ; then						\
-- 
2.14.4



More information about the Bird-users mailing list