diff --git a/Makefile b/Makefile index 8e4028aea3..00056e11a6 100644 --- a/Makefile +++ b/Makefile @@ -86,11 +86,13 @@ endif # Note: Uses the -N -l go compiler options to disable compiler optimizations # and inlining. Using these build options allows you to subsequently # use source debugging tools like delve. -all: binary docs-in-container +all: bin/skopeo docs help: @echo "Usage: make " @echo + @echo "Defaults to building bin/skopeo and docs" + @echo @echo " * 'install' - Install binaries and documents to system locations" @echo " * 'binary' - Build skopeo with a container" @echo " * 'static' - Build statically linked binary" @@ -134,7 +136,7 @@ build-container: ${CONTAINER_RUNTIME} build ${BUILD_ARGS} -t "$(IMAGE)" . $(MANPAGES): %: %.md - @sed -e 's/\((skopeo.*\.md)\)//' -e 's/\[\(skopeo.*\)\]/\1/' $< | $(GOMD2MAN) -in /dev/stdin -out $@ + sed -e 's/\((skopeo.*\.md)\)//' -e 's/\[\(skopeo.*\)\]/\1/' $< | $(GOMD2MAN) -in /dev/stdin -out $@ docs: $(MANPAGES) diff --git a/install.md b/install.md index 69547f1d31..6996b51e38 100644 --- a/install.md +++ b/install.md @@ -157,18 +157,7 @@ $ git clone https://github.com/containers/skopeo $GOPATH/src/github.com/containe $ cd $GOPATH/src/github.com/containers/skopeo && make bin/skopeo ``` -### Building in a container - -Building in a container is simpler, but more restrictive: - -- It requires the `podman` command and the ability to run Linux containers -- The created executable is a Linux executable, and depends on dynamic libraries - which may only be available only in a container of a similar Linux - distribution. - -```bash -$ make binary # Or (make all) to also build documentation, see below. -``` +By default the `make` command (make all) will build bin/skopeo and the documentation locally. ### Building documentation @@ -190,6 +179,19 @@ Then $ make docs ``` +### Building in a container + +Building in a container is simpler, but more restrictive: + +- It requires the `podman` command and the ability to run Linux containers. +- The created executable is a Linux executable, and depends on dynamic libraries + which may only be available only in a container of a similar Linux + distribution. + +```bash +$ make binary +``` + ### Installation Finally, after the binary and documentation is built: