From c1c96e22ce0f2a4cae63f45f015e70b1a4967d7c Mon Sep 17 00:00:00 2001 From: jaseg Date: Fri, 20 Sep 2013 15:47:50 +0200 Subject: [PATCH] Update Makefile: Do not try to install on "make" or "make all" To be consistent with usual makefile usage and to not surprise people too much, only do permanent changes to the system when explicitely prompted to do so via "make install" instead of on any "make" or "make all" invocation, which is usually used for *building*, not *installing* things. --- Makefile | 7 +++++-- README.md | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index c7f1b967c..1d8c303d6 100644 --- a/Makefile +++ b/Makefile @@ -3,9 +3,12 @@ SSHCOMMAND_URL ?= https://raw.github.com/progrium/sshcommand/master/sshcommand PLUGINHOOK_URL ?= https://s3.amazonaws.com/progrium-pluginhook/pluginhook_0.1.0_amd64.deb STACK_URL ?= github.com/progrium/buildstep -all: dependencies stack install plugins +all: + # Type "make install" to install. -install: +install: dependencies stack copyfiles plugins + +copyfiles: cp dokku /usr/local/bin/dokku cp receiver /home/git/receiver mkdir -p /var/lib/dokku/plugins diff --git a/README.md b/README.md index ba610a6ab..ec193a9ca 100644 --- a/README.md +++ b/README.md @@ -102,14 +102,14 @@ the repository and calling the install script. Example: $ git clone https://github.com/yourusername/dokku.git $ cd dokku - $ sudo make all + $ sudo make install The `Makefile` allows source URLs to be overridden to include customizations from your own repositories. The DOCKER_URL, GITRECEIVE_URL, PLUGINHOOK_URL, SSHCOMMAND_URL and STACK_URL environment variables may be set to override the defaults (see the `Makefile` for how these apply). Example: - $ sudo GITRECEIVE_URL=https://raw.github.com/yourusername/gitreceive/master/gitreceive make all + $ sudo GITRECEIVE_URL=https://raw.github.com/yourusername/gitreceive/master/gitreceive make install ## Advanced installation (bootstrap a server from your own repository)