summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/Makefile7
-rwxr-xr-xutils/install_server.sh2
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