summaryrefslogtreecommitdiff
path: root/INSTALL
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff.email>2018-09-30 14:11:00 +0200
committerJörg Frings-Fürst <debian@jff.email>2018-09-30 14:11:00 +0200
commit0ac947a9070322180e94d1b71e30836cce4d74bc (patch)
tree4a6f3923c250377536a5004ed203768111a1d27f /INSTALL
parenteca5837e235a356c8db9416bbbc13577db3e6f76 (diff)
parent01b2b5ec9177046f64c6d0a6e73a6ac8a42089a1 (diff)
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'INSTALL')
-rw-r--r--INSTALL13
1 files changed, 6 insertions, 7 deletions
diff --git a/INSTALL b/INSTALL
index 3fd6efa..9f69f84 100644
--- a/INSTALL
+++ b/INSTALL
@@ -4,17 +4,16 @@
To build and install Shotwell, type the following commands:
- $ [ -f configure ] || ./autogen.sh
- $ ./configure
- $ make
- $ Optional: make install
+ $ meson build
+ $ ninja -C build
+ $ Optional: ninja -C build install
* By default, Shotwell will install under /usr/local. The configure script
- can customize the prefix directory. Run ./configure --help for
+ can customize the prefix directory. Run meson build configure for
instructions and other installation options.
- * You may need to execute "make install" as root (i.e. sudo make install)
- if installing to system directories.
+ * You may need to execute "ninja -C build install" as root
+ (i.e. sudo ninja -C build install) if installing to system directories.
* If you wish to try Shotwell before installing it, you may execute it
directly from its build directory. Note that certain desktop integration