Mon Aug 10 21:35:05 PDT 2015

Makefile.in                                           |    2 +-
 android/Bootstrap/Makefile.shared                     |    4 ++--
 android/source/Makefile                               |    2 +-
 compilerplugins/Makefile-clang.mk                     |    2 +-
 config_host.mk.in                                     |    2 +-
 configure.ac                                          |    7 ++++---
 external/harfbuzz/ExternalProject_harfbuzz.mk         |    2 +-
 external/libabw/ExternalProject_libabw.mk             |    2 +-
 external/libcdr/ExternalProject_libcdr.mk             |    2 +-
 external/libebook/ExternalProject_libebook.mk         |    2 +-
 external/libeot/ExternalProject_libeot.mk             |    2 +-
 external/libetonyek/ExternalProject_libetonyek.mk     |    2 +-
 external/libfreehand/ExternalProject_libfreehand.mk   |    2 +-
 external/liblangtag/ExternalProject_langtag.mk        |    2 +-
 external/libmspub/ExternalProject_libmspub.mk         |    2 +-
 external/libmwaw/ExternalProject_libmwaw.mk           |    2 +-
 external/libodfgen/ExternalProject_libodfgen.mk       |    2 +-
 external/liborcus/ExternalProject_liborcus.mk         |    2 +-
 external/libpagemaker/ExternalProject_libpagemaker.mk |    2 +-
 external/librevenge/ExternalProject_librevenge.mk     |    2 +-
 external/libvisio/ExternalProject_libvisio.mk         |    2 +-
 external/libwpd/ExternalProject_libwpd.mk             |    2 +-
 external/libwpg/ExternalProject_libwpg.mk             |    2 +-
 external/libwps/ExternalProject_libwps.mk             |    2 +-
 filter/Configuration_filter.mk                        |    2 +-
 include/sal/detail/log.h                              |    3 +--
 instsetoo_native/CustomTarget_install.mk              |    2 +-
 odk/CustomTarget_doxygen.mk                           |    4 ++--
 solenv/gbuild/gbuild.mk                               |    2 +-
 29 files changed, 34 insertions(+), 34 deletions(-)

New commits:
commit a8db357874b3ab3f785457cd9a84c68a05d3c61e
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Mon Aug 10 14:06:40 2015 -0500

    gbuild/config stop using VERBOSE, use only verbose=t
    
    configure.ac was setting VERBOSE=YES/NO when really
    we use verbose=t or verbose=
    
    Change-Id: I47aee8d177cb2d788a62ecdbbb9cc3695c2bb299
    Reviewed-on: https://gerrit.libreoffice.org/17634
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Norbert Thiebaud <nthiebaud at gmail.com>

diff --git a/Makefile.in b/Makefile.in
index 3f806c0..5236134 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -58,7 +58,7 @@ gb_Side ?= host
 
 include $(BUILDDIR)/config_$(gb_Side).mk
 
-export GMAKE_OPTIONS?=-r$(if $(verbose)$(VERBOSE),,s)$(value $(MAKEFLAGS))
+export GMAKE_OPTIONS?=-r$(if $(verbose),,s)$(value $(MAKEFLAGS))
 
 PARALLELISM_OPTION := $(if $(filter-out 0,$(PARALLELISM)),-j $(PARALLELISM),)
 
diff --git a/android/Bootstrap/Makefile.shared b/android/Bootstrap/Makefile.shared
index 84c6881..aaf50ce 100644
--- a/android/Bootstrap/Makefile.shared
+++ b/android/Bootstrap/Makefile.shared
@@ -65,7 +65,7 @@ properties:
 	echo "APP_PLATFORM := android-21" >> jni/Application.mk
 
 install:
-	unset JAVA_HOME && $(ANT) $(if $(VERBOSE)$(verbose),,-quiet) debug install
+	unset JAVA_HOME && $(ANT) $(if $(verbose),,-quiet) debug install
 	@echo
 	@echo 'Run it with "make run"'
 	@echo
@@ -74,7 +74,7 @@ uninstall:
 	$(ANDROID_SDK_HOME)/platform-tools/adb uninstall $(APP_PACKAGE)
 
 clean: android_version_setup properties
-	$(ANT) $(if $(VERBOSE)$(verbose),,-quiet) -keep-going clean
+	$(ANT) $(if $(verbose),,-quiet) -keep-going clean
 	rm -rf assets libs $(SODEST) $(OBJLOCAL) $(BOOTSTRAPDIR)/no-resource-compress.xml
 	rm -f native-code.cxx
 	rm -rf $(APPCOMPATDIR)
diff --git a/android/source/Makefile b/android/source/Makefile
index 6f70a91..6711b6c 100644
--- a/android/source/Makefile
+++ b/android/source/Makefile
@@ -35,7 +35,7 @@ build-ant: android_version_setup copy-stuff prepare-appcompat link-so properties
 	#ownCloud lib dependency
 	$(call COPYJAR,$(WORKDIR)/UnpackedTarball/owncloud_android_lib/bin/owncloud-android-library.jar)
 #
-	unset JAVA_HOME && $(ANT) $(if $(VERBOSE)$(verbose),,-quiet) $(if $(ENABLE_RELEASE_BUILD),release,debug)
+	unset JAVA_HOME && $(ANT) $(if $(verbose),,-quiet) $(if $(ENABLE_RELEASE_BUILD),release,debug)
 
 run:
 	adb shell am start -n $(APP_PACKAGE)/.ui.LibreOfficeUIActivity
diff --git a/compilerplugins/Makefile-clang.mk b/compilerplugins/Makefile-clang.mk
index bed75ce..b914d37 100644
--- a/compilerplugins/Makefile-clang.mk
+++ b/compilerplugins/Makefile-clang.mk
@@ -32,7 +32,7 @@ CLANGINDIR=$(SRCDIR)/compilerplugins/clang
 # plugin will cause cache misses with ccache.
 CLANGOUTDIR=$(BUILDDIR)/compilerplugins/obj
 
-QUIET=$(if $(VERBOSE)$(verbose),,@)
+QUIET=$(if $(verbose),,@)
 
 ifneq ($(ENABLE_WERROR),)
 CLANGWERROR := -Werror
diff --git a/config_host.mk.in b/config_host.mk.in
index 63b10d5..500d752 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -614,7 +614,7 @@ export VALGRIND_CFLAGS=$(gb_SPACE)@VALGRIND_CFLAGS@
 export VALIDATOR_EXTENSION_PACK=@VALIDATOR_EXTENSION_PACK@
 export VCVER=@VCVER@
 export DEVENV=@DEVENV@
-export VERBOSE=@VERBOSE@
+export verbose?=@verbose@
 export VISIO_CFLAGS=$(gb_SPACE)@VISIO_CFLAGS@
 export VISIO_LIBS=$(gb_SPACE)@VISIO_LIBS@
 export WATCH_WINDOW_EXTENSION_PACK=@WATCH_WINDOW_EXTENSION_PACK@
diff --git a/configure.ac b/configure.ac
index 7b0f031..300d303 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12725,19 +12725,20 @@ AC_DEFINE_UNQUOTED(ONEDRIVE_CLIENT_SECRET, $ONEDRIVE_CLIENT_SECRET)
 # De- or increase default verbosity of build process
 # ===================================================================
 AC_MSG_CHECKING([build verbosity])
+verbose=
 if test -n "$enable_verbose"; then
     if test "$enable_verbose" = "yes"; then
-        VERBOSE="TRUE"
+        verbose="t"
         AC_MSG_RESULT([high])
     fi
     if test "$enable_verbose" = "no"; then
-        VERBOSE="FALSE"
+        verbose=
         AC_MSG_RESULT([low])
     fi
 else
     AC_MSG_RESULT([not set])
 fi
-AC_SUBST(VERBOSE)
+AC_SUBST(verbose)
 
 dnl ===================================================================
 dnl Hook up LibreOffice's nodep environmental variable to automake's equivalent
diff --git a/external/harfbuzz/ExternalProject_harfbuzz.mk b/external/harfbuzz/ExternalProject_harfbuzz.mk
index 302eed7..52db533 100644
--- a/external/harfbuzz/ExternalProject_harfbuzz.mk
+++ b/external/harfbuzz/ExternalProject_harfbuzz.mk
@@ -31,7 +31,7 @@ $(call gb_ExternalProject_get_state_target,harfbuzz,build) :
 			--with-freetype=no \
 			--with-cairo=no \
 			--with-glib=no \
-			$(if $(VERBOSE)$(verbose),--disable-silent-rules,--enable-silent-rules) \
+			$(if $(verbose),--disable-silent-rules,--enable-silent-rules) \
 			$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
 		&& (cd $(EXTERNAL_WORKDIR)/src && $(MAKE)) \
 	)
diff --git a/external/libabw/ExternalProject_libabw.mk b/external/libabw/ExternalProject_libabw.mk
index fd0b98a..9a07409 100644
--- a/external/libabw/ExternalProject_libabw.mk
+++ b/external/libabw/ExternalProject_libabw.mk
@@ -33,7 +33,7 @@ $(call gb_ExternalProject_get_state_target,libabw,build) :
 			--disable-tools \
 			--disable-debug \
 			--disable-werror \
-			$(if $(VERBOSE)$(verbose),--disable-silent-rules,--enable-silent-rules) \
+			$(if $(verbose),--disable-silent-rules,--enable-silent-rules) \
 			CXXFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),\
 				-I$(call gb_UnpackedTarball_get_dir,boost))" \
 			$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
diff --git a/external/libcdr/ExternalProject_libcdr.mk b/external/libcdr/ExternalProject_libcdr.mk
index fd9658d..e4d7c9b 100644
--- a/external/libcdr/ExternalProject_libcdr.mk
+++ b/external/libcdr/ExternalProject_libcdr.mk
@@ -35,7 +35,7 @@ $(call gb_ExternalProject_get_state_target,libcdr,build) :
 			--disable-debug \
 			--disable-werror \
 			--disable-weffc \
-			$(if $(VERBOSE)$(verbose),--disable-silent-rules,--enable-silent-rules) \
+			$(if $(verbose),--disable-silent-rules,--enable-silent-rules) \
 			CXXFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost))" \
 			$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
 		&& $(MAKE) \
diff --git a/external/libebook/ExternalProject_libebook.mk b/external/libebook/ExternalProject_libebook.mk
index 5e7f2b0..29c9b55 100644
--- a/external/libebook/ExternalProject_libebook.mk
+++ b/external/libebook/ExternalProject_libebook.mk
@@ -35,7 +35,7 @@ $(call gb_ExternalProject_get_state_target,libebook,build) :
 			--without-tools \
 			--disable-tests \
 			$(if $(ENABLE_DEBUG),--enable-debug,--disable-debug) \
-			$(if $(VERBOSE)$(verbose),--disable-silent-rules,--enable-silent-rules) \
+			$(if $(verbose),--disable-silent-rules,--enable-silent-rules) \
 			--disable-werror \
 			--disable-weffc \
 			CXXFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost))" \
diff --git a/external/libeot/ExternalProject_libeot.mk b/external/libeot/ExternalProject_libeot.mk
index dc6a987..e40186e 100644
--- a/external/libeot/ExternalProject_libeot.mk
+++ b/external/libeot/ExternalProject_libeot.mk
@@ -23,7 +23,7 @@ $(call gb_ExternalProject_get_state_target,libeot,build) :
 			--disable-shared \
 			--disable-debug \
 			CFLAGS='$(filter-out -std=gnu89,$(CFLAGS))' \
-		&& $(MAKE) $(if $(VERBOSE)$(verbose),V=1) \
+		&& $(MAKE) $(if $(verbose),V=1) \
 	)
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/libetonyek/ExternalProject_libetonyek.mk b/external/libetonyek/ExternalProject_libetonyek.mk
index 19be033..2f128d6 100644
--- a/external/libetonyek/ExternalProject_libetonyek.mk
+++ b/external/libetonyek/ExternalProject_libetonyek.mk
@@ -40,7 +40,7 @@ $(call gb_ExternalProject_get_state_target,libetonyek,build) :
 			--disable-weffc \
 			--without-tools \
 			$(if $(filter WNT,$(OS_FOR_BUILD)),MKDIR_P="$(shell cygpath -m /usr/bin/mkdir) -p") \
-			$(if $(VERBOSE)$(verbose),--disable-silent-rules,--enable-silent-rules) \
+			$(if $(verbose),--disable-silent-rules,--enable-silent-rules) \
 			$(if $(filter LINUX,$(OS)), \
 				'LDFLAGS=-Wl$(COMMA)-z$(COMMA)origin \
 					-Wl$(COMMA)-rpath$(COMMA)\$$$$ORIGIN') \
diff --git a/external/libfreehand/ExternalProject_libfreehand.mk b/external/libfreehand/ExternalProject_libfreehand.mk
index 4cc232f..15a17072 100644
--- a/external/libfreehand/ExternalProject_libfreehand.mk
+++ b/external/libfreehand/ExternalProject_libfreehand.mk
@@ -34,7 +34,7 @@ $(call gb_ExternalProject_get_state_target,libfreehand,build) :
 			--disable-debug \
 			--disable-werror \
 			--disable-weffc \
-			$(if $(VERBOSE)$(verbose),--disable-silent-rules,--enable-silent-rules) \
+			$(if $(verbose),--disable-silent-rules,--enable-silent-rules) \
 			$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
 		&& $(MAKE) \
 	)
diff --git a/external/liblangtag/ExternalProject_langtag.mk b/external/liblangtag/ExternalProject_langtag.mk
index c6b195d..723d832 100644
--- a/external/liblangtag/ExternalProject_langtag.mk
+++ b/external/liblangtag/ExternalProject_langtag.mk
@@ -34,7 +34,7 @@ $(call gb_ExternalProject_get_state_target,langtag,build):
 		&& $(if $(filter WNTMSC,$(OS)$(COM)),\
 			REAL_CC="$(shell cygpath -w $(lastword $(filter-out -%,$(CC))))" \
 			REAL_CC_FLAGS="$(filter -%,$(CC))") \
-		   $(if $(VERBOSE)$(verbose),V=1) \
+		   $(if $(verbose),V=1) \
 		   $(gb_Helper_set_ld_path) \
 		   $(MAKE) \
 	)
diff --git a/external/libmspub/ExternalProject_libmspub.mk b/external/libmspub/ExternalProject_libmspub.mk
index 644fc42..b45707d 100644
--- a/external/libmspub/ExternalProject_libmspub.mk
+++ b/external/libmspub/ExternalProject_libmspub.mk
@@ -34,7 +34,7 @@ $(call gb_ExternalProject_get_state_target,libmspub,build) :
 			$(if $(ENABLE_DEBUG),--enable-debug,--disable-debug) \
 			--disable-werror \
 			--disable-weffc \
-			$(if $(VERBOSE)$(verbose),--disable-silent-rules,--enable-silent-rules) \
+			$(if $(verbose),--disable-silent-rules,--enable-silent-rules) \
 			CXXFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost))" \
 			$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
 		&& $(MAKE) \
diff --git a/external/libmwaw/ExternalProject_libmwaw.mk b/external/libmwaw/ExternalProject_libmwaw.mk
index d1f05d3..5dbb772 100644
--- a/external/libmwaw/ExternalProject_libmwaw.mk
+++ b/external/libmwaw/ExternalProject_libmwaw.mk
@@ -34,7 +34,7 @@ $(call gb_ExternalProject_get_state_target,libmwaw,build) :
 			--disable-tools \
 			--disable-zip \
 			$(if $(ENABLE_DEBUG),--enable-debug,--disable-debug) \
-			$(if $(VERBOSE)$(verbose),--disable-silent-rules,--enable-silent-rules) \
+			$(if $(verbose),--disable-silent-rules,--enable-silent-rules) \
 			--disable-werror \
 			CXXFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),\
 				$(if $(COM_GCC_IS_CLANG),-Qunused-arguments) \
diff --git a/external/libodfgen/ExternalProject_libodfgen.mk b/external/libodfgen/ExternalProject_libodfgen.mk
index 2ad5a15..b60d406 100644
--- a/external/libodfgen/ExternalProject_libodfgen.mk
+++ b/external/libodfgen/ExternalProject_libodfgen.mk
@@ -34,7 +34,7 @@ $(call gb_ExternalProject_get_state_target,libodfgen,build) :
 			--disable-werror \
 			--disable-weffc \
 			--without-docs \
-			$(if $(VERBOSE)$(verbose),--disable-silent-rules,--enable-silent-rules) \
+			$(if $(verbose),--disable-silent-rules,--enable-silent-rules) \
 			CXXFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost)) $(if $(SYSTEM_REVENGE),,$(if $(filter-out MSC,$(COM)),-DLIBREVENGE_VISIBILITY))" \
 			$(if $(filter LINUX,$(OS)),$(if $(SYSTEM_REVENGE),, \
 				'LDFLAGS=-Wl$(COMMA)-z$(COMMA)origin \
diff --git a/external/liborcus/ExternalProject_liborcus.mk b/external/liborcus/ExternalProject_liborcus.mk
index 2975aeb..cc75810 100644
--- a/external/liborcus/ExternalProject_liborcus.mk
+++ b/external/liborcus/ExternalProject_liborcus.mk
@@ -107,7 +107,7 @@ $(call gb_ExternalProject_get_state_target,liborcus,build) :
 				boost_cv_lib_system=yes \
 			) \
 			$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
-		&& $(if $(VERBOSE)$(verbose),V=1) \
+		&& $(if $(verbose),V=1) \
 		   $(MAKE) \
 		$(if $(filter MACOSX,$(OS)),\
 			&& $(PERL) $(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl OOO \
diff --git a/external/libpagemaker/ExternalProject_libpagemaker.mk b/external/libpagemaker/ExternalProject_libpagemaker.mk
index f892d42..ab76136 100644
--- a/external/libpagemaker/ExternalProject_libpagemaker.mk
+++ b/external/libpagemaker/ExternalProject_libpagemaker.mk
@@ -32,7 +32,7 @@ $(call gb_ExternalProject_get_state_target,libpagemaker,build) :
 			--disable-debug \
 			--disable-werror \
 			--disable-weffc \
-			$(if $(VERBOSE)$(verbose),--disable-silent-rules,--enable-silent-rules) \
+			$(if $(verbose),--disable-silent-rules,--enable-silent-rules) \
 			CXXFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost))" \
 			$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
 		&& $(MAKE) \
diff --git a/external/librevenge/ExternalProject_librevenge.mk b/external/librevenge/ExternalProject_librevenge.mk
index 861a47c..e023237 100644
--- a/external/librevenge/ExternalProject_librevenge.mk
+++ b/external/librevenge/ExternalProject_librevenge.mk
@@ -33,7 +33,7 @@ $(call gb_ExternalProject_get_state_target,librevenge,build) :
 			--disable-streams \
 			--disable-generators \
 			--without-docs \
-			$(if $(VERBOSE)$(verbose),--disable-silent-rules,--enable-silent-rules) \
+			$(if $(verbose),--disable-silent-rules,--enable-silent-rules) \
 			CXXFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost))" \
 			$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
 			$(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \
diff --git a/external/libvisio/ExternalProject_libvisio.mk b/external/libvisio/ExternalProject_libvisio.mk
index db65a45..b714788 100644
--- a/external/libvisio/ExternalProject_libvisio.mk
+++ b/external/libvisio/ExternalProject_libvisio.mk
@@ -34,7 +34,7 @@ $(call gb_ExternalProject_get_state_target,libvisio,build) :
 			--disable-tools \
 			$(if $(ENABLE_DEBUG),--enable-debug,--disable-debug) \
 			--disable-werror \
-			$(if $(VERBOSE)$(verbose),--disable-silent-rules,--enable-silent-rules) \
+			$(if $(verbose),--disable-silent-rules,--enable-silent-rules) \
 			CXXFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost))" \
 			$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
 		&& $(MAKE) \
diff --git a/external/libwpd/ExternalProject_libwpd.mk b/external/libwpd/ExternalProject_libwpd.mk
index 286e502..feee6e0 100644
--- a/external/libwpd/ExternalProject_libwpd.mk
+++ b/external/libwpd/ExternalProject_libwpd.mk
@@ -33,7 +33,7 @@ $(call gb_ExternalProject_get_state_target,libwpd,build) :
 			$(if $(filter MACOSX,$(OS)), \
 				--disable-werror \
 				--prefix=/@.__________________________________________________OOO) \
-			$(if $(VERBOSE)$(verbose),--disable-silent-rules,--enable-silent-rules) \
+			$(if $(verbose),--disable-silent-rules,--enable-silent-rules) \
 			$(if $(filter TRUE,$(DISABLE_DYNLOADING)),CFLAGS="$(CFLAGS) $(gb_VISIBILITY_FLAGS) $(gb_COMPILEROPTFLAGS)" CXXFLAGS="$(CXXFLAGS) $(gb_VISIBILITY_FLAGS) $(gb_VISIBILITY_FLAGS_CXX) $(gb_COMPILEROPTFLAGS)") \
 			$(if $(filter LINUX,$(OS)),$(if $(SYSTEM_REVENGE),, \
 				'LDFLAGS=-Wl$(COMMA)-z$(COMMA)origin \
diff --git a/external/libwpg/ExternalProject_libwpg.mk b/external/libwpg/ExternalProject_libwpg.mk
index e65e2ac..e05a526 100644
--- a/external/libwpg/ExternalProject_libwpg.mk
+++ b/external/libwpg/ExternalProject_libwpg.mk
@@ -33,7 +33,7 @@ $(call gb_ExternalProject_get_state_target,libwpg,build) :
 			--disable-debug \
 			--disable-werror \
 			$(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \
-			$(if $(VERBOSE)$(verbose),--disable-silent-rules,--enable-silent-rules) \
+			$(if $(verbose),--disable-silent-rules,--enable-silent-rules) \
 			$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
 			$(if $(filter LINUX,$(OS)), \
 				'LDFLAGS=-Wl$(COMMA)-z$(COMMA)origin \
diff --git a/external/libwps/ExternalProject_libwps.mk b/external/libwps/ExternalProject_libwps.mk
index 10b39b3..475f56a 100644
--- a/external/libwps/ExternalProject_libwps.mk
+++ b/external/libwps/ExternalProject_libwps.mk
@@ -34,7 +34,7 @@ $(call gb_ExternalProject_get_state_target,libwps,build) :
 			--disable-tools \
 			--disable-debug \
 			--disable-werror \
-			$(if $(VERBOSE)$(verbose),--disable-silent-rules,--enable-silent-rules) \
+			$(if $(verbose),--disable-silent-rules,--enable-silent-rules) \
 			CXXFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost)) $(gb_VISIBILITY_FLAGS) $(gb_VISIBILITY_FLAGS_CXX)" \
 			$(if $(filter LINUX,$(OS)),$(if $(SYSTEM_REVENGE),, \
 				'LDFLAGS=-Wl$(COMMA)-z$(COMMA)origin \
diff --git a/filter/Configuration_filter.mk b/filter/Configuration_filter.mk
index 29e672b..bb54fcd 100644
--- a/filter/Configuration_filter.mk
+++ b/filter/Configuration_filter.mk
@@ -25,7 +25,7 @@ filter_MERGE_TARGET := $(call gb_ExternalExecutable_get_dependencies,python) \
 	$(SRCDIR)/filter/source/config/tools/merge/pyAltFCFGMerge
 filter_MERGE := $(call gb_ExternalExecutable_get_command,python) \
 	$(SRCDIR)/filter/source/config/tools/merge/pyAltFCFGMerge \
-	$(if $(VERBOSE)$(verbose),-verbose)
+	$(if $(verbose),-verbose)
 
 ### filter configuration rules: generic stuff #######################
 
diff --git a/include/sal/detail/log.h b/include/sal/detail/log.h
index 3a1dce7..11ece36 100644
--- a/include/sal/detail/log.h
+++ b/include/sal/detail/log.h
@@ -19,8 +19,7 @@
 
 /* This header makes available replacements working in both C and C++ for the
    obsolete osl/diagnose.h functionality that in turn is used from both C and
-   C++ code and the obsolete tools/debug.hxx and
-   canvas/inc/canvas/verbosetrace.hxx functionality that uses printf-style
+   C++ code and the obsolete tools/debug.hxx functionality that uses printf-style
    formatting.  Once that obsolete functionality is removed, this header can be
    removed, too.
 
diff --git a/instsetoo_native/CustomTarget_install.mk b/instsetoo_native/CustomTarget_install.mk
index 03134ce..a74a2177 100644
--- a/instsetoo_native/CustomTarget_install.mk
+++ b/instsetoo_native/CustomTarget_install.mk
@@ -89,7 +89,7 @@ $(foreach pkgformat,$(5),\
 	) \
 	$(4) \
 	-format $(pkgformat) \
-	$(if $(VERBOSE)$(verbose),-verbose,-quiet) \
+	$(if $(verbose),-verbose,-quiet) \
 ),$@.log)
 endef
 
diff --git a/odk/CustomTarget_doxygen.mk b/odk/CustomTarget_doxygen.mk
index be8c865..3311af2 100644
--- a/odk/CustomTarget_doxygen.mk
+++ b/odk/CustomTarget_doxygen.mk
@@ -43,7 +43,7 @@ $(call gb_CustomTarget_get_workdir,odk/docs)/cpp/Doxyfile : \
 		-e 's!^OUTPUT_DIRECTORY = %$$!OUTPUT_DIRECTORY = $(call odk_cygwin_path,$(odk_cpp_DOXY_WORKDIR))!' \
 		-e 's!^PROJECT_BRIEF = %$$!PROJECT_BRIEF = "$(PRODUCTNAME) $(PRODUCTVERSION) SDK C/C++ API Reference"!' \
 		-e 's!^PROJECT_NAME = %$$!PROJECT_NAME = $(PRODUCTNAME)!' \
-		-e 's!^QUIET = %$$!QUIET = $(if $(VERBOSE),NO,YES)!' \
+		-e 's!^QUIET = %$$!QUIET = $(if $(verbose),NO,YES)!' \
 		-e 's!^STRIP_FROM_PATH = %$$!STRIP_FROM_PATH = $(call odk_cygwin_path,$(odk_cpp_PREFIX))!' \
 		$< > $@
 
@@ -81,7 +81,7 @@ $(call gb_CustomTarget_get_workdir,odk/docs)/idl/Doxyfile : \
 		-e 's!^OUTPUT_DIRECTORY = %$$!OUTPUT_DIRECTORY = $(call odk_cygwin_path,$(odk_idl_DOXY_WORKDIR))!' \
 		-e 's!^PROJECT_BRIEF = %$$!PROJECT_BRIEF = "$(PRODUCTNAME) $(PRODUCTVERSION) SDK API Reference"!' \
 		-e 's!^PROJECT_NAME = %$$!PROJECT_NAME = $(PRODUCTNAME)!' \
-		-e 's!^QUIET = %$$!QUIET = $(if $(VERBOSE),NO,YES)!' \
+		-e 's!^QUIET = %$$!QUIET = $(if $(verbose),NO,YES)!' \
 		-e 's!^STRIP_FROM_PATH = %$$!STRIP_FROM_PATH = $(call odk_cygwin_path,$(odk_idl_PREFIX))!' \
 		-e 's!^SHORT_NAMES = %$$!SHORT_NAMES = $(if $(filter WNT,$(OS)),YES,NO)!' \
 		$< > $@
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index 756b845..3142062 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -78,7 +78,7 @@ COMMA :=,
 
 CLOSE_PAREN :=)
 
-gb_VERBOSE := $(verbose)$(VERBOSE)
+gb_VERBOSE := $(verbose)
 
 include $(GBUILDDIR)/Helper.mk
 
