diff --git a/Makefile b/Makefile
index bb3ad2a7f..1a9cec879 100644
--- a/Makefile
+++ b/Makefile
@@ -394,9 +394,11 @@ endif
 	install -d $(DESTDIR)$(INCLUDEDIR)/carla/includes
 ifeq ($(LINUX),true)
 ifeq ($(HAVE_JACK),true)
+ifeq ($(JACKBRIDGE_DIRECT),true)
 	install -d $(DESTDIR)$(JACK_LIBDIR)
 endif
 endif
+endif
 
 ifeq ($(HAVE_PYQT),true)
 	# Create directories (gui)
@@ -437,11 +439,13 @@ endif
 
 ifeq ($(LINUX),true)
 ifeq ($(HAVE_JACK),true)
+ifeq ($(JACKBRIDGE_DIRECT),true)
 	# Install internal jack client
 	ln -sf \
 		$(LIBDIR)/carla/libcarla_standalone2.so \
 		$(DESTDIR)$(JACK_LIBDIR)/carla.so
 endif
+endif
 
 ifneq ($(JACKBRIDGE_DIRECT),true)
 	# Install custom libjack
diff --git a/source/backend/engine/CarlaEngineJack.cpp b/source/backend/engine/CarlaEngineJack.cpp
index d6e6ae379..12d8627d1 100644
--- a/source/backend/engine/CarlaEngineJack.cpp
+++ b/source/backend/engine/CarlaEngineJack.cpp
@@ -2955,7 +2955,7 @@ CarlaEngine* CarlaEngine::newJack()
 
 CARLA_BACKEND_END_NAMESPACE
 
-#ifndef BUILD_BRIDGE
+#if defined(JACKBRIDGE_DIRECT) && !defined(BUILD_BRIDGE)
 // -----------------------------------------------------------------------
 // internal jack client
 
@@ -3042,4 +3042,4 @@ void jack_finish(void *arg)
 }
 
 // -----------------------------------------------------------------------
-#endif
+#endif // defined(JACKBRIDGE_DIRECT) && !defined(BUILD_BRIDGE)