diff --git a/.travis.yml b/.travis.yml index 080bd95..210bdb7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ compiler: before_script: # Installing yasm (needed for compiling vpx) and openal - - sudo apt-get -yq install yasm libopenal-dev libconfig-dev libalut-dev libnotify-dev asciidoc + - sudo apt-get -yq install yasm libopenal-dev libconfig-dev libalut-dev libnotify-dev # Installing libsodium, needed for toxcore - git clone https://github.com/jedisct1/libsodium.git libsodium - cd libsodium diff --git a/README.md b/README.md index 07f396e..699e7ae 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ Toxic is a [Tox](https://tox.im)-based instant messenging client which formerly ##### Documentation * [Asciidoc](http://asciidoc.org/index.html) (only required for regenerating manpages) - * Run `make doc` after editing the asciidoc files to regenerate the manpages. + * Run `make doc` in the build directory after editing the asciidoc files to regenerate the manpages. * **NOTE FOR DEVELOPERS**: asciidoc files and generated manpages will need to be commited together. ### Compiling diff --git a/build/Makefile b/build/Makefile index 672f711..df197c3 100644 --- a/build/Makefile +++ b/build/Makefile @@ -46,7 +46,7 @@ endif -include $(CFG_DIR)/checks/check_features.mk # Targets -all: toxic doc +all: toxic toxic: $(OBJ) @echo " LD $@" diff --git a/cfg/targets/install.mk b/cfg/targets/install.mk index c011cb0..715b6f9 100644 --- a/cfg/targets/install.mk +++ b/cfg/targets/install.mk @@ -1,5 +1,5 @@ # Install target -install: toxic doc +install: toxic mkdir -p $(abspath $(DESTDIR)/$(BINDIR)) mkdir -p $(abspath $(DESTDIR)/$(DATADIR)) mkdir -p $(abspath $(DESTDIR)/$(DATADIR))/sounds diff --git a/src/prompt.c b/src/prompt.c index 1f336b7..993a064 100644 --- a/src/prompt.c +++ b/src/prompt.c @@ -427,7 +427,7 @@ static void print_welcome_msg(ToxWindow *self) line_info_add(self, NULL, NULL, NULL, SYS_MSG, 1, BLUE, " |_ _/ _ \\ \\/ /_ _/ ___|"); line_info_add(self, NULL, NULL, NULL, SYS_MSG, 1, BLUE, " | || | | \\ / | | | "); line_info_add(self, NULL, NULL, NULL, SYS_MSG, 1, BLUE, " | || |_| / \\ | | |___ "); - line_info_add(self, NULL, NULL, NULL, SYS_MSG, 1, BLUE, " |_| \\___/_/\\_\\___\\____|"); + line_info_add(self, NULL, NULL, NULL, SYS_MSG, 1, BLUE, " |_| \\___/_/\\_\\___\\____| v." TOXICVER); line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, ""); const char *msg = "Welcome to Toxic, a free, open source Tox-based instant messenging client.";