From 0bb5160cb08ad8f16ce241e55a1ed6c3042bf2aa Mon Sep 17 00:00:00 2001 From: antirez Date: Mon, 3 Oct 2011 16:04:44 +0200 Subject: [PATCH] Revert "Use the new install script as make install target. Message about install script requiring root changed a bit to make it more evident." After talking with Pieter he changed my mind about this, it is better to have a simpler install script that works everywhere, and the complex one can be always executed if needed by hand. We'll make possibly a new target for the full featured installation script, and even suggest it after a Make install. This reverts commit f1e60d75309990b25a1763e004d7044c77c53834. --- src/Makefile | 7 ++++++- utils/install_server.sh | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/Makefile b/src/Makefile index 4b0bf074..42f0ad01 100644 --- a/src/Makefile +++ b/src/Makefile @@ -236,4 +236,9 @@ src/help.h: @../utils/generate-command-help.rb > help.h install: all - @../utils/install_server.sh + mkdir -p $(INSTALL_BIN) + $(INSTALL) $(PRGNAME) $(INSTALL_BIN) + $(INSTALL) $(BENCHPRGNAME) $(INSTALL_BIN) + $(INSTALL) $(CLIPRGNAME) $(INSTALL_BIN) + $(INSTALL) $(CHECKDUMPPRGNAME) $(INSTALL_BIN) + $(INSTALL) $(CHECKAOFPRGNAME) $(INSTALL_BIN) diff --git a/utils/install_server.sh b/utils/install_server.sh index eed1e251..71c57d70 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 "ERROR: You must run this installation script as root. Sorry!\n" + echo "You must run this script as root. Sorry!" exit 1 fi -- 2.47.2