diff --git a/sf_bernina/Makefile b/sf_bernina/Makefile
index 5600183..b054fd6 100644
--- a/sf_bernina/Makefile
+++ b/sf_bernina/Makefile
@@ -3,10 +3,9 @@ OBJ_DIR = ./obj
 BIN_DIR = ./bin
 MKDIR = mkdir -p
 
-CPP = g++
-CPPFLAGS = -Wall -Wfatal-errors -fPIC -pthread -std=c++11 -I../../src -I${CONDA_PREFIX}/include
-LDLIBS = -L../../bin -L${CONDA_PREFIX}/lib -L/usr/lib64 -lcpp_h5_writer -lzmq -lhdf5 -lhdf5_hl -lhdf5_cpp -lhdf5_hl_cpp -lboost_system -lboost_regex -lboost_thread -lpthread
-LDLIBS_TEST = -lgtest_main -lgtest
+CC = g++
+CFLAGS = -Wall -Wfatal-errors -fPIC -pthread -std=c++11 -I../../src -I${CONDA_PREFIX}/include
+LDFLAGS = -L../../bin -L${CONDA_PREFIX}/lib -L/usr/lib64 -lcpp_h5_writer -lzmq -lhdf5 -lhdf5_hl -lhdf5_cpp -lhdf5_hl_cpp -lboost_system -lboost_regex -lboost_thread -lpthread
 
 HEADERS = $(wildcard $(SRC_DIR)/*.hpp)
 SRCS = $(wildcard $(SRC_DIR)/*.cpp)
@@ -15,22 +14,24 @@ OBJS = $(patsubst $(SRC_DIR)/%.cpp, $(OBJ_DIR)/%.o, $(SRCS))
 bernina: lib all
 
 lib:
-	$(MAKE) -C ../../ lib
+	$(MAKE) -C ../lib deploy
 
 all: build_dirs bernina_h5_writer
 
-debug: CPPFLAGS += -DDEBUG_OUTPUT -g
+debug: CFLAGS += -DDEBUG_OUTPUT -g
 debug: bernina
 
+deploy: bernina
+	cp bin/* ${CONDA_PREFIX}/bin
+
 bernina_h5_writer: $(OBJS)
-	$(CPP) $(LDFLAGS) -o $(BIN_DIR)/bernina_h5_writer $(OBJS) $(LDLIBS)
+	$(CC) $(LDFLAGS) -o $(BIN_DIR)/bernina_h5_writer $(OBJS) $(LDFLAGS)
 
 $(OBJ_DIR)/%.o: $(SRC_DIR)/%.cpp
-	$(CPP) $(CPPFLAGS) $(LDLIBS) -c -o $@ $<
+	$(CC) $(CFLAGS) $(LDFLAGS) -c -o $@ $<
 
 build_dirs:
 	$(MKDIR) $(OBJ_DIR) $(BIN_DIR)
 
 clean:
-	rm -rf $(OBJ_DIR) $(BIN_DIR)
-	$(MAKE) -C ../../ clean
\ No newline at end of file
+	rm -rf $(OBJ_DIR) $(BIN_DIR)
\ No newline at end of file