diff --git a/makefile b/makefile
index d076a284d3a3c8112659b3f7c189174b44e9978b..6572c9c8522e601ab8710988308c7db5f51cac83 100644
--- a/makefile
+++ b/makefile
@@ -34,7 +34,7 @@ endif
 
 .PHONY: test-connection
 test-connection:
-	make_db test-connection	
+	./make_db test-connection
 
 .PHONY: upgrade
 upgrade:
@@ -45,17 +45,13 @@ install: _install _grant upgrade
 
 .PHONY: _install
 _install:
-	make_db install_db
-	@if $(MAKE) _exists > /dev/null 2>&1; then \
-		printf "\n\nA database with with the name \"$(DATABASE_NAME)\" does already exist.\nCall 'make drop-$(DATABASE_NAME)' to delete that database or reconfigure with './configure'.\n"; \
-		exit 1; \
-	else sed 's/db_2_0/$(DATABASE_NAME)/g' $(INSTALL_SQL_FILE) | $(MYSQL_CMD) $(MYSQL_CONNECTION); fi
+	./make_db install_db
 
 .PHONY: _grant
 _grant:
-	make_db grant
+	./make_db grant
 
 # Drop the user and a given database
 .PHONY: drop-%
 drop-%:
-	@make_db drop $(patsubst drop-%,%,$@)
+	./make_db drop $(patsubst drop-%,%,$@)