From: Aki Tuomi <aki.tuomi@open-xchange.com>
Date: Wed, 14 Dec 2022 10:58:40 +0000 (+0200)
Subject: global: Use wget -nv when downloading
X-Git-Tag: 2.4.0~3284
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=47222b2a5d8642f8ec2f9bb947d4c1271b616858;p=thirdparty%2Fdovecot%2Fcore.git

global: Use wget -nv when downloading

wget -q hides errors too, so lets use -nv to emit short line instead.
---

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 85ec538ea0..1fed8c68b0 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -19,16 +19,6 @@ am__v_Q_ = $(am__v_Q_$(AM_DEFAULT_VERBOSITY))
 am__v_Q_0 = -q
 am__v_Q_1 =
 
-AM_V_DL_DOCS = $(am__v_DL_DOCS_$(V))
-am__v_DL_DOCS_ = $(am__v_DL_DOCS_$(AM_DEFAULT_VERBOSITY))
-am__v_DL_DOCS_0 = @echo "  DL     " $(DOCS_URL);
-am__v_DL_DOCS_1 =
-
-AM_V_DL_MAN = $(am__v_DL_MAN_$(V))
-am__v_DL_MAN_ = $(am__v_DL_MAN_$(AM_DEFAULT_VERBOSITY))
-am__v_DL_MAN_0 = @echo "  DL     " $(MAN_URL);
-am__v_DL_MAN_1 =
-
 if INSTALL_DOCS
 SUBDIRS += man
 DOCDIRS += html
@@ -37,10 +27,10 @@ endif
 extra_dist_extra += html
 
 html-dl:
-	$(AM_V_DL_DOCS)$(WGET) $(AM_V_Q) -O- $(DOCS_URL) | xz -d | $(am__untar)
+	$(AM_V_at)$(WGET) -nv -O- $(DOCS_URL) | xz -d | $(am__untar)
 
 man-dl:
-	$(AM_V_DL_MAN)$(WGET) $(AM_V_Q) -O- $(MAN_URL) | xz -d | $(am__untar)
+	$(AM_V_at)$(WGET) -nv -O- $(MAN_URL) | xz -d | $(am__untar)
 
 all-local: html
 
diff --git a/src/lib-fts/Makefile.am b/src/lib-fts/Makefile.am
index 7306ab1925..bf89a49dfe 100644
--- a/src/lib-fts/Makefile.am
+++ b/src/lib-fts/Makefile.am
@@ -43,20 +43,15 @@ EXTRA_DIST = \
 	word-break-data.c \
 	stopwords/stopwords_malformed.txt
 
-AM_V_Q = $(am__v_Q_$(V))
-am__v_Q_ = $(am__v_Q_$(AM_DEFAULT_VERBOSITY))
-am__v_Q_0 = -q
-am__v_Q_1 =
-
 $(srcdir)/WordBreakProperty.txt:
-	$(AM_V_GEN)test -f $@ || $(WGET) $(AM_V_Q) -O $@ https://dovecot.org/res/WordBreakProperty.txt
+	$(AM_V_at)test -f $@ || $(WGET) -nv -O $@ https://dovecot.org/res/WordBreakProperty.txt
 $(srcdir)/word-boundary-data.c: $(srcdir)/word-properties.pl $(srcdir)/WordBreakProperty.txt
-	$(AM_V_GEN)perl $(srcdir)/word-properties.pl boundaries $(srcdir)/WordBreakProperty.txt > $@
+	$(AM_V_at)perl $(srcdir)/word-properties.pl boundaries $(srcdir)/WordBreakProperty.txt > $@
 
 $(srcdir)/PropList.txt:
-	$(AM_V_GEN)test -f $@ || $(WGET) $(AM_V_Q) -O $@ https://dovecot.org/res/PropList.txt
+	$(AM_V_at)test -f $@ || $(WGET) -nv -O $@ https://dovecot.org/res/PropList.txt
 $(srcdir)/word-break-data.c: $(srcdir)/word-properties.pl $(srcdir)/PropList.txt
-	$(AM_V_GEN)perl $(srcdir)/word-properties.pl breaks $(srcdir)/PropList.txt > $@
+	$(AM_V_at)perl $(srcdir)/word-properties.pl breaks $(srcdir)/PropList.txt > $@
 
 
 if BUILD_FTS_STEMMER
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 817a6dfffb..be00a6ddb8 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -15,11 +15,6 @@ EXTRA_DIST = unicodemap.c unicodemap.pl UnicodeData.txt
 LEX=/bin/false
 YACC=/bin/false
 
-AM_V_Q = $(am__v_Q_$(V))
-am__v_Q_ = $(am__v_Q_$(AM_DEFAULT_VERBOSITY))
-am__v_Q_0 = -q
-am__v_Q_1 =
-
 # We use custom rules here because we want to use flex and bison instead
 # of lex and yacc (or bison in yacc-compatibility mode).  Both flex and
 # bison can handle properly naming the generated files, and it is simpler
@@ -36,7 +31,7 @@ am__v_Q_1 =
 event-filter-parser.h: event-filter-parser.c
 
 $(srcdir)/UnicodeData.txt:
-	$(AM_V_GEN)test -f $@ || $(WGET) $(AM_V_Q) -O $@ https://dovecot.org/res/UnicodeData.txt
+	$(AM_V_at)test -f $@ || $(WGET) -nv -O $@ https://dovecot.org/res/UnicodeData.txt
 
 $(srcdir)/unicodemap.c: $(srcdir)/unicodemap.pl $(srcdir)/UnicodeData.txt
 	$(AM_V_GEN)perl $(srcdir)/unicodemap.pl < $(srcdir)/UnicodeData.txt > $@