diff --git a/.gitignore b/.gitignore index f42839eb..79e4d4bb 100644 --- a/.gitignore +++ b/.gitignore @@ -80,3 +80,7 @@ src/fe-fuzz/oom-* .deps .libs + +Build +subprojects/* +!subprojects/*.wrap diff --git a/.travis.yml b/.travis.yml index a09b7271..896048d6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -33,6 +33,7 @@ before_install: - ( cd bin ; ln -s ../meson-*/meson.py meson ) - curl -sSLf https://github.com/irssi-import/glib-travis-build/releases/download/2.58.3/travis-xenial-glib-2.58.3.tar.xz | tar xJ - export PKG_CONFIG_PATH=$HOME/glib-build/lib/x86_64-linux-gnu/pkgconfig + - export LD_LIBRARY_PATH=$HOME/glib-build/lib/x86_64-linux-gnu - popd install: diff --git a/README.md b/README.md index 3550b640..9ea92940 100644 --- a/README.md +++ b/README.md @@ -21,8 +21,8 @@ available. ``` git clone https://github.com/irssi/irssi cd irssi -./autogen.sh -make && sudo make install +meson Build +ninja -C Build && sudo ninja -C Build install ``` #### Release source installation