Update relevant files after moving meson to build/

Update meson build instructions

diff --git a/.travis.yml b/.travis.yml
index 777e5ad86351767ff6411986f8846a0a1461b5d6..dbea289f6b99427abfd17a7c3392920480485b9a 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -74,7 +74,7 @@ script:
         && python3.5 get-pip.py --user
         && rm get-pip.py
         && pip3.5 install --user meson ninja;
-      mkdir contrib/meson/build;
+      mkdir build/meson/build;
       pushd "$_";
       meson --buildtype=debug -Dbuild_contrib=true -Dbuild_tests=true ..
         && ninja

diff --git a/README.md b/README.md
index dc99dc0fd30a3887e34ec9170eda57d982c284bd..c0b5505721b4caba28e7c6b75920d2f489753ab5 100644 (file)
--- a/README.md
+++ b/README.md
@@ -125,7 +125,7 @@ By default, `CMAKE_BUILD_TYPE` is set to `Release`.
 
 #### Meson
 
-A Meson project is provided within `contrib/meson`.
+A Meson project is provided within `build/meson`.
 
 #### Visual Studio (Windows)
 

diff --git a/build/meson/README.md b/build/meson/README.md
index a2730faaa845dee4698b1c15788d4acceef55a50..f5818cc69fd10296177dcb15cd181758ee91c853 100644 (file)
--- a/build/meson/README.md
+++ b/build/meson/README.md
@@ -1,16 +1,23 @@
-This Meson project is provided with no guarantee and maintained
+contrib/meson - Meson build system for zstandard
+================================================
+
+Meson is a build system designed to optimize programmer productivity.
+It aims to do this by providing simple, out-of-the-box support for
+modern software development tools and practices, such as unit tests,
+coverage reports, Valgrind, CCache and the like.
+
+This Meson build system is provided with no guarantee and maintained
 by Dima Krasner <dima@dimakrasner.com>.
 
 It outputs one `libzstd`, either shared or static, depending on
 `default_library` option.
 
-How to build
-============
+## How to build
 
-`cd` to this meson directory (`zstd/contrib/meson`) and type:
+`cd` to this meson directory (`build/meson`)
 
 ```sh
-meson --buildtype=release --strip --prefix=/usr builddir
+meson --buildtype=release -D with-contrib=true -D with-tests=true -D with-contrib=true builddir
 cd builddir
 ninja             # to build
 ninja install     # to install
@@ -22,7 +29,7 @@ You might want to install it in staging directory:
 DESTDIR=./staging ninja install
 ```
 
-To configure the build, use:
+To configure build options, use:
 
 ```sh
 meson configure