diff --git a/.travis.yml b/.travis.yml index 23135f1..fb156f3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,4 +4,4 @@ compiler: - gcc - clang -script: make +script: make install diff --git a/Makefile b/Makefile index 20bd335..49f1fee 100644 --- a/Makefile +++ b/Makefile @@ -18,10 +18,7 @@ DIR_CONFIG = BUILDDIR=$(BUILDDIR) INSTALLDIR=$(INSTALL_ROOT) BIN_PREFIX=$(BIN_PR # ============================================================================== # supported make options (clean, install...) -.PHONY: all default install clean - -# all calls all other options -all: default install +.PHONY: default install clean # default builds components default: diff --git a/README.md b/README.md index 007cab9..ede4025 100644 --- a/README.md +++ b/README.md @@ -32,9 +32,9 @@ moxerver.cfg Build and install ================= -Run `make` to build the project. -This default build will produce artifacts in a directory "install.dir" with executables installed in "usr/bin" (prefix is "usr"). +Run `make` to build the project and `make install` to install it. +This default build will produce artifacts in a directory "install.dir" with executables installed in "usr/bin" (default prefix is "usr"). -You can install directly into some directory with `make INSTALL_ROOT=/some/dir`. -You can change the install prefix for executables with `make BIN_PREFIX=someprefix`. +You can install directly into some other directory with `make INSTALL_ROOT=/some/dir`. +You can change the default install prefix for executables with `make BIN_PREFIX=someprefix`. These options can also be combined into `make INSTALL_ROOT=/some/dir BIN_PREFIX=someprefix`