Revert "Use the new install script as make install target. Message about install...

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.

diff --git a/src/Makefile b/src/Makefile
index 4b0bf074091f06f3b219fd37fe53403a516a7ce8..42f0ad0160c268e5566f1dd1178a36ac3aa4878f 100644 (file)
--- 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 eed1e2513bc40fc5bed69f60e7ad28f57cce1db2..71c57d70dd68ed3933649ca9d70557ad85239768 100755 (executable)
--- 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