From: Adam Dickmeiss Date: Thu, 25 Dec 2008 12:04:43 +0000 (+0100) Subject: Mention Git instead of CVS. Use [ instead of test where appropriate. X-Git-Tag: v3.0.40~15 X-Git-Url: http://sru.miketaylor.org.uk/?a=commitdiff_plain;h=98db267fe0117e2bff00e044ccbee8f37dd69548;p=yaz-moved-to-github.git Mention Git instead of CVS. Use [ instead of test where appropriate. --- diff --git a/buildconf.sh b/buildconf.sh index dff3467..a889bdb 100755 --- a/buildconf.sh +++ b/buildconf.sh @@ -6,7 +6,7 @@ autoconf=autoconf libtoolize=libtoolize test -d config || mkdir config -if test .git; then +if [ -d .git ]; then git submodule init git submodule update fi @@ -26,7 +26,7 @@ fi if $automake --version|head -1 |grep '1\.[4-7]'; then echo "automake 1.4-1.7 is active. You should use automake 1.8 or later" - if test -f /etc/debian_version; then + if [ -f /etc/debian_version ]; then echo " sudo apt-get install automake1.9" echo " sudo update-alternatives --config automake" fi @@ -34,7 +34,6 @@ if $automake --version|head -1 |grep '1\.[4-7]'; then fi set -x -# I am tired of underquoted warnings for Tcl macros $aclocal -I m4 $libtoolize --automake --force $automake --add-missing @@ -66,7 +65,7 @@ case $1 in esac if $enable_configure; then - if test -n "$sh_cflags"; then + if [ -n "$sh_cflags" ]; then CFLAGS="$sh_cflags" CXXFLAGS="$sh_cxxflags" ./configure --disable-shared --enable-static $* else ./configure $* @@ -98,7 +97,7 @@ EOF Or just build the Debian packages without configuring dpkg-buildpackage -rfakeroot -When building from a CVS checkout, you need these Debian packages: +When building from Git, you need these Debian packages: autoconf, automake, libtool, gcc, bison, any tcl, xsltproc, docbook, docbook-xml, docbook-xsl, libxslt1-dev, libssl-dev, libreadline5-dev, libwrap0-dev, @@ -113,7 +112,7 @@ EOF fi if [ "`uname -s`" = FreeBSD ]; then cat <