From: David Tolnay <dtolnay@gmail.com>
Date: Sat, 25 Jul 2015 06:25:55 +0000 (-0700)
Subject: Update setup.sh script
X-Git-Tag: jq-1.5rc2~6
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ceb2684f2fce243a92fbbab16d4cfd824a2ba535;p=jq

Update setup.sh script

Adjust what gets cleaned up now that ChangeLog and
config/.gitignore are checked into the repo, and skip
install and distcheck steps.
---

diff --git a/setup.sh b/setup.sh
index 55ee697..a5a9aee 100755
--- a/setup.sh
+++ b/setup.sh
@@ -10,10 +10,11 @@
 if [ "clean" == "$1" ]; then
   make distclean || echo "continuing..."
   find config/m4 -type f \( -name libtool\* -o -name lt\* \) | xargs rm -f
-  find config -name m4 -prune -o -type f -print | xargs rm -f
-  rm -rf tmp autom4te.cache
-  rm -f INSTALL Makefile.in aclocal.m4 configure config.h.in ChangeLog
-  rm -f jv_utf8_tables.gen.h
+  find config -name m4 -prune \
+      -o -name .gitignore -prune \
+      -o -type f -print | xargs rm -f
+  rm -rf autom4te.cache
+  rm -f Makefile.in aclocal.m4 configure
 elif [ "superclean" == "$1" ]; then
   # if autoconf errors during distcheck, it leaves files that need chmod'ing
   ver=$(scripts/version|tr -d '\n')
@@ -26,10 +27,7 @@ elif [ "superclean" == "$1" ]; then
   fi
 else
   autoreconf --install
-  ./configure --prefix=/opt/junk
-  make check
-  [ -d tmp ] && mv tmp tmp-
-  mkdir tmp
-  make DESTDIR=./tmp install
-  make distcheck
+  ./configure --disable-valgrind
+  make -j8
+  make check -j4
 fi