From 62b661caa51119aeebaed27ee35d34c1f39b2be6 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Mon, 22 Oct 2012 02:00:23 +0200
Subject: [PATCH] scripts/*: rename 'INDENT' variable to not interference with
 upcoming Mesa's 'INDENT' variable

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 config/path          |  2 +-
 scripts/autoreconf   |  4 ++--
 scripts/build        |  4 ++--
 scripts/create_addon |  4 ++--
 scripts/get          |  4 ++--
 scripts/install      |  4 ++--
 scripts/unpack       | 10 +++++-----
 7 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/config/path b/config/path
index a87cc736af..20559a1019 100644
--- a/config/path
+++ b/config/path
@@ -144,4 +144,4 @@ else
   exec 3>&2
   exec 4>/dev/null
 fi
-INDENT_SIZE=4
+BUILD_INDENT_SIZE=4
diff --git a/scripts/autoreconf b/scripts/autoreconf
index 9116b1498e..9690053c7b 100755
--- a/scripts/autoreconf
+++ b/scripts/autoreconf
@@ -24,8 +24,8 @@
 
 [ ! -f "$PKG_BUILD/configure.in" -a ! -f "$PKG_BUILD/configure.ac" ] && echo "configure.in or configure.ac not found" && exit 1
 
-printf "%${INDENT}c AUTORECONF   $1\n" ' '>&$SILENT_OUT
-export INDENT=$((${INDENT:-1}+$INDENT_SIZE))
+printf "%${BUILD_INDENT}c AUTORECONF   $1\n" ' '>&$SILENT_OUT
+export BUILD_INDENT=$((${BUILD_INDENT:-1}+$BUILD_INDENT_SIZE))
 
 do_autoreconf $PKG_BUILD
 
diff --git a/scripts/build b/scripts/build
index cd735432dd..b5aaff04db 100755
--- a/scripts/build
+++ b/scripts/build
@@ -50,8 +50,8 @@ fi
 if [ ! -f $STAMP ]; then
   rm -f $STAMP
 
-  printf "%${INDENT}c BUILD    $1\n" ' '>&$SILENT_OUT
-  export INDENT=$((${INDENT:-1}+$INDENT_SIZE))
+  printf "%${BUILD_INDENT}c BUILD    $1\n" ' '>&$SILENT_OUT
+  export BUILD_INDENT=$((${BUILD_INDENT:-1}+$BUILD_INDENT_SIZE))
 
   for p in $PKG_BUILD_DEPENDS; do
     $SCRIPTS/build $p
diff --git a/scripts/create_addon b/scripts/create_addon
index b1e6c9a841..aaa74590de 100755
--- a/scripts/create_addon
+++ b/scripts/create_addon
@@ -43,8 +43,8 @@ fi
 
 $SCRIPTS/build $@
 
-printf  "%${INDENT}c CREATE ADDON  $1\n" ' '>&$SILENT_OUT
-export INDENT=$((${INDENT:-1}+$INDENT_SIZE))
+printf  "%${BUILD_INDENT}c CREATE ADDON  $1\n" ' '>&$SILENT_OUT
+export BUILD_INDENT=$((${BUILD_INDENT:-1}+$BUILD_INDENT_SIZE))
 
 if [ -f $PKG_DIR/addon ]; then
 
diff --git a/scripts/get b/scripts/get
index 1a7f839584..f69436fb55 100755
--- a/scripts/get
+++ b/scripts/get
@@ -57,8 +57,8 @@ if [ -n "$PKG_URL" ]; then
 
     rm -f $STAMP
 
-    printf "%${INDENT}c GET      $1\n" ' '>&$SILENT_OUT
-    export INDENT=$((${INDENT:-1}+$INDENT_SIZE))
+    printf "%${BUILD_INDENT}c GET      $1\n" ' '>&$SILENT_OUT
+    export BUILD_INDENT=$((${BUILD_INDENT:-1}+$BUILD_INDENT_SIZE))
 
     until [ -f "$STAMP" ] || $WGET_CMD $i || $WGET_CMD $PACKAGE_MIRROR; do
       NBWGET=$(($NBWGET+1))
diff --git a/scripts/install b/scripts/install
index beb266c95e..19c93fdccc 100755
--- a/scripts/install
+++ b/scripts/install
@@ -65,8 +65,8 @@ fi
 
 $SCRIPTS/build $@
 
-printf  "%${INDENT}c INSTALL  $1\n" ' '>&$SILENT_OUT
-export INDENT=$((${INDENT:-1}+$INDENT_SIZE))
+printf  "%${BUILD_INDENT}c INSTALL  $1\n" ' '>&$SILENT_OUT
+export BUILD_INDENT=$((${BUILD_INDENT:-1}+$BUILD_INDENT_SIZE))
 
 for p in $PKG_DEPENDS; do
   $SCRIPTS/install $p
diff --git a/scripts/unpack b/scripts/unpack
index dee9593ff1..8c81a21049 100755
--- a/scripts/unpack
+++ b/scripts/unpack
@@ -47,8 +47,8 @@ done
 
 [ -f "$STAMP" ] && exit 0
 
-printf "%${INDENT}c UNPACK   $1\n" ' '>&$SILENT_OUT
-export INDENT=$((${INDENT:-1}+$INDENT_SIZE))
+printf "%${BUILD_INDENT}c UNPACK   $1\n" ' '>&$SILENT_OUT
+export BUILD_INDENT=$((${BUILD_INDENT:-1}+$BUILD_INDENT_SIZE))
 
 rm -rf $BUILD/$1[-_][0-9]*
 rm -rf $BUILD/$1[-_]r[0-9]*
@@ -82,10 +82,10 @@ for i in $PKG_DIR/patches/$PKG_NAME-$PKG_VERSION*.patch ; do
     PATCH=`basename $i`
     PT=`echo $PATCH | sed 's/.*\.\(.*\)$/\1/'`
     if [ "$PT" != "patch" -a "$PT" != "$TARGET_ARCH" ]; then
-      printf "%${INDENT}c SKIP PATCH:   $i\n" ' '>&$SILENT_OUT
+      printf "%${BUILD_INDENT}c SKIP PATCH:   $i\n" ' '>&$SILENT_OUT
       continue;
     else
-      printf "%${INDENT}c APPLY PATCH:   $i\n" ' '>&$SILENT_OUT
+      printf "%${BUILD_INDENT}c APPLY PATCH:   $i\n" ' '>&$SILENT_OUT
       cat $i | patch -d `echo "$PKG_BUILD" | cut -f1 -d\ ` -p1 >&$VERBOSE_OUT
     fi
   fi
@@ -94,7 +94,7 @@ done
 [ -f "$PKG_DIR/unpack" ] && $PKG_DIR/unpack $@ >&$VERBOSE_OUT
 
 for config in `find $BUILD/$1* -name config.guess | sed 's/config.guess//'`; do
-  printf "%${INDENT}c FIXCONFIG:   $config\n" ' '>&$SILENT_OUT
+  printf "%${BUILD_INDENT}c FIXCONFIG:   $config\n" ' '>&$SILENT_OUT
 
   [ -f "$config/config.guess" ] && cp -f $SCRIPTS/configtools/config.guess $config
   [ -f "$config/config.sub" ] && cp -f $SCRIPTS/configtools/config.sub $config