Merge branch 'develop' of pwmt.org:zathura into develop

Makefile

@@ -12,7 +12,7 @@ LIBS     += $(SQLITE_LIB)
 SOURCE    = $(OSOURCE)
 CPPFLAGS += -DWITH_SQLITE
 else
-SOURCE    = $(filter-out database-sqlite.c,$(OSOURCE))
+SOURCE    = $(filter-out ${PROJECT}/database-sqlite.c,$(OSOURCE))
 endif
 
 ifneq ($(WITH_MAGIC),0)
@@ -87,8 +87,8 @@ ${PROJECT}/version.h: ${PROJECT}/version.h.in config.mk
 		-e 's/ZVMINOR/${ZATHURA_VERSION_MINOR}/' \
 		-e 's/ZVREV/${ZATHURA_VERSION_REV}/' \
 		-e 's/ZVAPI/${ZATHURA_API_VERSION}/' \
-		-e 's/ZVABI/${ZATHURA_ABI_VERSION}/' ${PROJECT}/version.h.in > version.h.tmp
-	$(QUIET)mv version.h.tmp ${PROJECT}/version.h
+		-e 's/ZVABI/${ZATHURA_ABI_VERSION}/' ${PROJECT}/version.h.in > ${PROJECT}/version.h.tmp
+	$(QUIET)mv ${PROJECT}/version.h.tmp ${PROJECT}/version.h
 
 ${PROJECT}/dbus-interface-definitions.c: data/org.pwmt.zathura.xml
 	$(QUIET)echo '#include "dbus-interface-definitions.h"' > $@.tmp
@@ -298,7 +298,7 @@ uninstall: uninstall-headers
 	$(QUIET)rm -f $(DESTDIR)$(APPDATAPREFIX)/$(PROJECT).appdata.xml
 	$(MAKE) -C po uninstall
 
--include $(wildcard .depend/*.dep)
+-include $(wildcard ${DEPENDDIR}/*.dep)
 
 .PHONY: all options clean doc debug valgrind gdb dist doc install uninstall \
 	test po install-headers uninstall-headers update-po install-manpages \

doc/man/zathurarc.5.rst

@@ -651,6 +651,14 @@ values are "plain", "sqlite" (if built with sqlite support) and "null". If
 * Value type: String
 * Default value: plain
 
+dbus-service
+^^^^^^^^^^^^^^^^^^^
+En/Disables the D-Bus service. If the services is disabled, SyncTeX forward
+synchronization is not available.
+
+* Value type: Boolean
+* Default value: true
+
 incremental-search
 ^^^^^^^^^^^^^^^^^^
 En/Disables incremental search (search while typing).
@@ -927,13 +935,6 @@ Defines the command executed for SyncTeX backward synchronization.
 * Value type: String
 * Default value:
 
-syntex-dbus-service
-^^^^^^^^^^^^^^^^^^^
-En/Disables the D-Bus service required for SyncTeX forward synchronization.
-
-* Value type: Boolean
-* Default value: true
-
 index-fg
 ^^^^^^^^
 Defines the foreground color of the index mode.

tests/Makefile

@@ -142,6 +142,6 @@ clean:
 	$(QUIET)rm -rf ${BUILDDIR}
 	$(QUIET)rm -rf ${DEPENDDIR}
 
-.PHONY: all options clean debug run
+.PHONY: all clean debug run
 
 -include $(wildcard ${DEPENDDIR}/*.dep)