From d225c83d1164581375b4340b169d85f30b9db964 Mon Sep 17 00:00:00 2001
From: xarkes <antide.petit@gmail.com>
Date: Sat, 24 Feb 2018 14:41:22 +0100
Subject: [PATCH] Easier meson instructions

---
 Makefile     |  1 +
 README.md    | 18 ++++++++++--------
 sys/meson.py |  2 +-
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/Makefile b/Makefile
index 7ec0173a9ea0d..eb73a374ec75f 100644
--- a/Makefile
+++ b/Makefile
@@ -412,6 +412,7 @@ B=$(DESTDIR)$(BINDIR)
 L=$(DESTDIR)$(LIBDIR)
 
 meson-symstall: symstall-sdb
+	@echo "[ Meson symstall (not stable) ]"
 	ln -fs $(PWD)/binr/r2pm/r2pm  ${B}/r2pm
 	ln -fs $(PWD)/build/binr/rasm2/rasm2 ${B}/rasm2
 	ln -fs $(PWD)/build/binr/rarun2/rarun2 ${B}/rarun2
diff --git a/README.md b/README.md
index 7d98a80fe0280..cca84dd2e42d4 100644
--- a/README.md
+++ b/README.md
@@ -72,24 +72,26 @@ using root privileges and sudo, simply run:
 The sys/install.sh method uses acr+make to build r2 from sources, which is the default
 and recommended way, but there's also a work-in-progress support for Meson.
 
-Run first the configuration process:
-
-	$ ./configure
-
 You can install last version of meson and ninja using r2pm:
 
 	$ r2pm -i meson
 	$ r2pm -r make meson
 	$ r2pm -r make meson-symstall
 
-Or just run those lines if you have them available in PATH:
+Or just run this line if you have them available in PATH:
+
+        $ python ./sys/meson.py --prefix=/usr --shared --install
+
+Alternatively you can try these lines (but it is just a wrapper around the above script):
 
-	$ make meson                # will run make meson-config automatically
+        $ ./configure
+	$ make meson
 	$ sudo make meson-symstall  # symstall the meson build into PREFIX (/usr)
 	$ sudo make meson-uninstall # uninstall the meson installation
 
-The PREFIX is inherited from the last run of ./configure, so it's recommended to run
-sys/install.sh at least once to autodetect this, this step will end up into meson.
+But if you do it via the Makefile, note that the PREFIX is inherited from the last run
+of ./configure, so it's recommended to run sys/install.sh at least once to autodetect this,
+this step will end up into meson.
 
 At the moment, the meson build system doesnt supports much configuration options and it
 is not able to build all the plugins, it has been tested to work on the following hosts:
diff --git a/sys/meson.py b/sys/meson.py
index b92999e630105..f91d263ba5a21 100644
--- a/sys/meson.py
+++ b/sys/meson.py
@@ -291,7 +291,7 @@ def install(args):
     if os.name == 'nt':
         win_dist(args)
         return
-    log.warning('Install not implemented yet.')
+    log.warning('Install not implemented yet for this platform.')
     # TODO
     #if os.name == 'posix':
     #    os.system('DESTDIR="{destdir}" ninja -C {build} install'