X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=travis%2Fbrotli.sh;h=d23dd19b87a4d9061ccbd22d8a7b08e45d613216;hp=322a3c3d7d31cff9cc28c8c903ef15342f6b4369;hb=8d5c6f1fb45df722099abed5170837f637925e65;hpb=a251d0e3ac09b5f0b5507c165697d9a1041717a5

diff --git a/travis/brotli.sh b/travis/brotli.sh
index 322a3c3..d23dd19 100755
--- a/travis/brotli.sh
+++ b/travis/brotli.sh
@@ -1,11 +1,19 @@
 #!/bin/bash
 
-if test -n "$with_http_libbrotli_dir" && test "$with_http_libbrotli_dir" != "no"; then
-	git clone https://github.com/google/brotli.git /home/travis/brotli.git
-	cd /home/travis/brotli.git
-	git checkout v1.0.2
+BROTLI_DIR="$with_http_libbrotli_dir"
+BROTLI_SRC="$BROTLI_DIR.git"
+
+if test -n "$BROTLI_DIR" && test "$BROTLI_DIR" != "no"; then
+	if test -d "$BROTLI_SRC"; then
+		cd "$BROTLI_SRC"
+		git pull
+	else
+		git clone https://github.com/google/brotli.git "$BROTLI_SRC"
+		cd "$BROTLI_SRC"
+	fi
+	git checkout $1
 	./bootstrap
-	./configure --prefix=/home/travis/brotli
-	make -j2
-	make install
+	./configure -C --prefix="$BROTLI_DIR"
+	make -j ${JOBS:2}
+	make install INSTALL=install
 fi