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.
This commit is contained in:
jaseg
2013-09-20 15:47:50 +02:00
committed by jaseg
parent 9b4fe6badd
commit c1c96e22ce
2 changed files with 7 additions and 4 deletions

View File

@@ -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

View File

@@ -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)