From f1e60d75309990b25a1763e004d7044c77c53834 Mon Sep 17 00:00:00 2001
From: antirez <antirez@gmail.com>
Date: Mon, 3 Oct 2011 13:28:54 +0200
Subject: [PATCH] Use the new install script as make install target. Message
 about install script requiring root changed a bit to make it more evident.

---
 src/Makefile            | 7 +------
 utils/install_server.sh | 2 +-
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/Makefile b/src/Makefile
index 42f0ad016..4b0bf0740 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -236,9 +236,4 @@ src/help.h:
 	@../utils/generate-command-help.rb > help.h
 
 install: all
-	mkdir -p $(INSTALL_BIN)
-	$(INSTALL) $(PRGNAME) $(INSTALL_BIN)
-	$(INSTALL) $(BENCHPRGNAME) $(INSTALL_BIN)
-	$(INSTALL) $(CLIPRGNAME) $(INSTALL_BIN)
-	$(INSTALL) $(CHECKDUMPPRGNAME) $(INSTALL_BIN)
-	$(INSTALL) $(CHECKAOFPRGNAME) $(INSTALL_BIN)
+	@../utils/install_server.sh
diff --git a/utils/install_server.sh b/utils/install_server.sh
index 71c57d70d..eed1e2513 100755
--- a/utils/install_server.sh
+++ b/utils/install_server.sh
@@ -47,7 +47,7 @@ echo "This script will help you easily set up a running redis server
 
 #check for root user TODO: replace this with a call to "id"
 if [ `whoami` != "root" ] ; then
-	echo "You must run this script as root. Sorry!"
+	echo "ERROR: You must run this installation script as root. Sorry!\n"
 	exit 1
 fi