From c779b7c4b293f2b3b7f67f6e0100e525f68b15a0 Mon Sep 17 00:00:00 2001 From: smatz Date: Thu, 31 Jul 2008 14:32:35 +0000 Subject: [PATCH] (svn r13894) -Fix: bashisms in configure and Makefile.in --- Makefile.in | 2 +- configure | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Makefile.in b/Makefile.in index 2d26a8b0f2..819d5835bf 100644 --- a/Makefile.in +++ b/Makefile.in @@ -37,7 +37,7 @@ REVISION = !!REVISION!! AWK = !!AWK!! DISTCC = !!DISTCC!! -RES := $(shell if ! [ -f $(CONFIG_CACHE_SOURCE_LIST) ] || [ -n "`cmp $(CONFIG_CACHE_SOURCE_LIST) $(SOURCE_LIST)`" ]; then cp $(SOURCE_LIST) $(CONFIG_CACHE_SOURCE_LIST); fi ) +RES := $(shell if [ ! -f $(CONFIG_CACHE_SOURCE_LIST) ] || [ -n "`cmp $(CONFIG_CACHE_SOURCE_LIST) $(SOURCE_LIST)`" ]; then cp $(SOURCE_LIST) $(CONFIG_CACHE_SOURCE_LIST); fi ) all: config.cache ifdef DISTCC diff --git a/configure b/configure index 5d01778b86..3f8b6f58b3 100755 --- a/configure +++ b/configure @@ -32,7 +32,7 @@ MEDIA_DIR="$ROOT_DIR/media" SOURCE_LIST="$ROOT_DIR/source.list" if [ "$1" = "--reconfig" ] || [ "$1" = "--reconfigure" ]; then - if ! [ -f "config.cache" ]; then + if [ ! -f "config.cache" ]; then echo "can't reconfigure, because never configured before" exit 1 fi @@ -43,7 +43,9 @@ if [ "$1" = "--reconfig" ] || [ "$1" = "--reconfigure" ]; then exit $? fi -export SHOW_HELP="0" +# 'export SHOW_HELP="0"' doesn't work on some systems +SHOW_HELP="0" +export SHOW_HELP set_default detect_params "$@" @@ -70,7 +72,7 @@ else PIPE_SORT="$sort" fi -if ! [ -f "$LANG_DIR/english.txt" ]; then +if [ ! -f "$LANG_DIR/english.txt" ]; then echo "Languages not found in $LANG_DIR. Can't continue without it." echo "Please make sure the dir exists and contains at least english.txt" fi