From d274d618b2dfa086bdd73c9bf825e8d9f0b0e608 Mon Sep 17 00:00:00 2001 From: John Kerl Date: Wed, 22 Dec 2021 17:53:46 -0500 Subject: [PATCH] Build-from-source info with/without make --- README.md | 2 ++ docs/src/build.md | 8 +++----- docs/src/build.md.in | 8 +++----- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index ea665705d..1ebb22276 100644 --- a/README.md +++ b/README.md @@ -79,7 +79,9 @@ See also [building from source](https://miller.readthedocs.io/en/latest/build.ht # Building from source * `make`: takes just a few seconds and produces the Miller executable, which is `./mlr` (or `.\mlr.exe` on Windows). + * Without `make`: `go build github.com/johnkerl/miller/cmd/mlr` * `make check` runs tests. + * Without `make`: `go test github.com/johnkerl/miller/internal/pkg/...` and `mlr regtest` * `make install` installs executable `/usr/local/bin/mlr` and manual page `/usr/local/share/man/man1/mlr.1` (so you can do `man mlr`). * You can instead do `./configure --prefix=/some/install/path` followed by `make install` if you want to install somewhere other than `/usr/local`. * See also the doc page on [building from source](https://miller.readthedocs.io/en/latest/build). diff --git a/docs/src/build.md b/docs/src/build.md index 141cd218f..7a2223d00 100644 --- a/docs/src/build.md +++ b/docs/src/build.md @@ -31,17 +31,15 @@ Two-clause BSD license [https://github.com/johnkerl/miller/blob/master/LICENSE.t * `cd mlr-i.j.k` * `cd go` * `make` creates the `./mlr` (or `.\mlr.exe` on Windows) executable + * Without `make`: `go build github.com/johnkerl/miller/cmd/mlr` * `make check` runs tests + * Without `make`: `go test github.com/johnkerl/miller/internal/pkg/...` and `mlr regtest` * `make install` installs the `mlr` executable and the `mlr` manpage -* On Windows, if you don't have `make`, then you can do `choco install make` -- or, alternatively: - * `cd go` - * `go build` creates `mlr.exe` - * `go test -v mlr\src\...` and `go test -v` runs tests ## From git clone * `git clone https://github.com/johnkerl/miller` -* `make`, `make check`, and `make install` as above +* `make`/`go build github.com/johnkerl/miller/cmd/mlr` as above ## In case of problems diff --git a/docs/src/build.md.in b/docs/src/build.md.in index 0acaed2f0..9ae3291c3 100644 --- a/docs/src/build.md.in +++ b/docs/src/build.md.in @@ -15,17 +15,15 @@ Two-clause BSD license [https://github.com/johnkerl/miller/blob/master/LICENSE.t * `cd mlr-i.j.k` * `cd go` * `make` creates the `./mlr` (or `.\mlr.exe` on Windows) executable + * Without `make`: `go build github.com/johnkerl/miller/cmd/mlr` * `make check` runs tests + * Without `make`: `go test github.com/johnkerl/miller/internal/pkg/...` and `mlr regtest` * `make install` installs the `mlr` executable and the `mlr` manpage -* On Windows, if you don't have `make`, then you can do `choco install make` -- or, alternatively: - * `cd go` - * `go build` creates `mlr.exe` - * `go test -v mlr\src\...` and `go test -v` runs tests ## From git clone * `git clone https://github.com/johnkerl/miller` -* `make`, `make check`, and `make install` as above +* `make`/`go build github.com/johnkerl/miller/cmd/mlr` as above ## In case of problems