summaryrefslogtreecommitdiff
path: root/docs/markdown/Tutorial.md
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2017-05-03 18:27:29 +0300
committerGitHub <noreply@github.com>2017-05-03 18:27:29 +0300
commit2bb03f19fd9842d8c7966336ee967786f8edfbda (patch)
tree707f00e4b355d30c6d4d0de23e3364bf82b6c35d /docs/markdown/Tutorial.md
parent33b79dcf2502420c0db806fece1b35c724366f40 (diff)
parent276d342ebaf859dd53e145ead3e98e2cebb360ab (diff)
downloadmeson-2bb03f19fd9842d8c7966336ee967786f8edfbda.tar.gz
Merge pull request #1725 from whot/master
documentation fixes
Diffstat (limited to 'docs/markdown/Tutorial.md')
-rw-r--r--docs/markdown/Tutorial.md8
1 files changed, 4 insertions, 4 deletions
diff --git a/docs/markdown/Tutorial.md b/docs/markdown/Tutorial.md
index 524861dcf..ae2e38165 100644
--- a/docs/markdown/Tutorial.md
+++ b/docs/markdown/Tutorial.md
@@ -30,7 +30,7 @@ executable('demo', 'main.c')
That is all. We are now ready to build our application. First we need to initialise the build by going into the source directory and issuing the following commands.
```console
-$ meson build
+$ meson builddir
```
We create a separate build directory to hold all of the compiler output. Meson is different from some other build systems in that it does not permit in-source builds. You must always create a separate build directory. Common convention is to put the default build directory in a subdirectory of your toplevel source directory.
@@ -40,7 +40,7 @@ When Meson is run it prints the following output.
The Meson build system
version: 0.13.0-research
Source dir: /home/jpakkane/mesontutorial
- Build dir: /home/jpakkane/mesontutorial/build
+ Build dir: /home/jpakkane/mesontutorial/builddir
Build type: native build
Project name is "tutorial".
Using native c compiler "ccache cc". (gcc 4.8.2)
@@ -49,7 +49,7 @@ When Meson is run it prints the following output.
Now we are ready to build our code.
```
-$ cd build
+$ cd builddir
$ ninja
```
@@ -102,7 +102,7 @@ Once you have set up your build directory the first time, you don't ever need to
The Meson build system
version: 0.13.0-research
Source dir: /home/jpakkane/mesontutorial
- Build dir: /home/jpakkane/mesontutorial/build
+ Build dir: /home/jpakkane/mesontutorial/builddir
Build type: native build
Project name is "tutorial".
Using native c compiler "ccache cc". (gcc 4.8.2)