Use the new install script as make install target. Message about inst…

…all script requiring root changed a bit to make it more evident.
Plasma · Oct 3, 2011 · f1e60d7 · f1e60d7
1 parent 78f56a5
commit f1e60d7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git 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
@@ -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