diff --git a/lib/Makefile.villas.inc b/lib/Makefile.villas.inc
index 9d4d00d02..92aed87c4 100644
--- a/lib/Makefile.villas.inc
+++ b/lib/Makefile.villas.inc
@@ -71,7 +71,7 @@ install-libvillas: libvillas
 	install -m 0755 -D -T $(LIB) $(DESTDIR)$(PREFIX)/lib/$(LIB_NAME).so.$(LIB_ABI_VERSION)
 	install -m 0644 -D -t $(DESTDIR)$(PREFIX)/include/villas/ include/villas/*.h
 	ln -srf $(DESTDIR)$(PREFIX)/lib/$(LIB_NAME).so.$(LIB_ABI_VERSION) $(DESTDIR)$(PREFIX)/lib/$(LIB_NAME).so
-	ldconfig
+	if [ "$(PLATFORM)" == "Linux" ]; then ldconfig; fi
 
 clean-libvillas:
 	rm -f $(LIB)
diff --git a/lib/nodes/Makefile.inc b/lib/nodes/Makefile.inc
index 12e6bcf0e..12916cd1f 100644
--- a/lib/nodes/Makefile.inc
+++ b/lib/nodes/Makefile.inc
@@ -23,13 +23,13 @@
 LIB_SRCS += $(addprefix lib/nodes/, cbuilder.c loopback.c)
 
 ifeq ($(PLATFORM),Linux)
-	WITH_FILE     ?= 1
-	WITH_SIGNAL   ?= 1
-	WITH_NGSI     ?= 1
 	WITH_FPGA     ?= 1
 	WITH_TEST_RTT ?= 1
 endif
 
+WITH_FILE      ?= 1
+WITH_SIGNAL    ?= 1
+WITH_NGSI      ?= 1
 WITH_WEBSOCKET ?= 1
 WITH_SOCKET    ?= 1
 WITH_ZEROMQ    ?= 1