From a200def82a44c8ca3534943eb6ce22a7b642abc0 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Fri, 15 Jul 2011 19:15:09 +0200
Subject: [PATCH] xf86-video-fglrx: rename $ARCH variable to $FGLRX_ARCH,
 because its used from buildsystem too, thanks to de45dd

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/x11/driver/xf86-video-fglrx/build   |  8 +++----
 packages/x11/driver/xf86-video-fglrx/install | 22 ++++++++++----------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/packages/x11/driver/xf86-video-fglrx/build b/packages/x11/driver/xf86-video-fglrx/build
index 459bafe94d..690376286e 100755
--- a/packages/x11/driver/xf86-video-fglrx/build
+++ b/packages/x11/driver/xf86-video-fglrx/build
@@ -23,22 +23,22 @@
 . config/options $1
 
 if [ "$TARGET_ARCH" = i386 ]; then
-  ARCH=x86
+  FGLRX_ARCH=x86
 elif [ "$TARGET_ARCH" = x86_64 ]; then
-  ARCH=x86_64
+  FGLRX_ARCH=x86_64
 fi
 
 cd $PKG_BUILD/common/lib/modules/fglrx/build_mod
 # sed -i -e 's/__SMP__/CONFIG_SMP/' *.c *h
 # sed -i -e 's/ifdef MODVERSIONS/ifdef CONFIG_MODVERSIONS/' *.c *.h
 
-ln -sf $ROOT/$PKG_BUILD/arch/$ARCH/lib/modules/fglrx/build_mod/libfglrx_ip.a .
+ln -sf $ROOT/$PKG_BUILD/arch/$FGLRX_ARCH/lib/modules/fglrx/build_mod/libfglrx_ip.a .
 
 cd 2.6.x
 make CC=${CC} KDIR=$(kernel_path)
 
 
 cp $ROOT/$PKG_DIR/source/amdxvba.h $SYSROOT_PREFIX/usr/include
-cp $ROOT/$PKG_BUILD/arch/$ARCH/usr/X11R6/*/libXvBAW.so* $SYSROOT_PREFIX/usr/lib
+cp $ROOT/$PKG_BUILD/arch/$FGLRX_ARCH/usr/X11R6/*/libXvBAW.so* $SYSROOT_PREFIX/usr/lib
   ln -sf libXvBAW.so.1.0 $SYSROOT_PREFIX/usr/lib/libXvBAW.so.1
   ln -sf libXvBAW.so.1 $SYSROOT_PREFIX/usr/lib/libXvBAW.so
diff --git a/packages/x11/driver/xf86-video-fglrx/install b/packages/x11/driver/xf86-video-fglrx/install
index 1c545c099b..5ceddca06e 100755
--- a/packages/x11/driver/xf86-video-fglrx/install
+++ b/packages/x11/driver/xf86-video-fglrx/install
@@ -27,11 +27,11 @@ $SCRIPTS/build busybox-hosttools
 VER=`ls $BUILD/linux*/modules/lib/modules`
 
 if [ "$TARGET_ARCH" = i386 ]; then
-  ARCH=x86
+  FGLRX_ARCH=x86
   LIBDIR=lib
   BASEDIR=xpic
 elif [ "$TARGET_ARCH" = x86_64 ]; then
-  ARCH=x86_64
+  FGLRX_ARCH=x86_64
   LIBDIR=lib64
   BASEDIR=xpic_64a
 fi
@@ -72,24 +72,24 @@ mkdir -p $INSTALL/etc/ati
 
 # DRI driver
 mkdir -p $INSTALL/usr/lib/dri
-  cp $PKG_BUILD/arch/$ARCH/usr/X11R6/$LIBDIR/modules/dri/fglrx_dri.so* $INSTALL/usr/lib/dri
+  cp $PKG_BUILD/arch/$FGLRX_ARCH/usr/X11R6/$LIBDIR/modules/dri/fglrx_dri.so* $INSTALL/usr/lib/dri
 
 # OpenGL libs
 mkdir -p $INSTALL/usr/lib
   # rename to not conflicting with Mesa libGL.so
-  cp -P $PKG_BUILD/arch/$ARCH/usr/X11R6/$LIBDIR/fglrx/fglrx-libGL.so* $INSTALL/usr/lib/libGL_fglrx.so.1
+  cp -P $PKG_BUILD/arch/$FGLRX_ARCH/usr/X11R6/$LIBDIR/fglrx/fglrx-libGL.so* $INSTALL/usr/lib/libGL_fglrx.so.1
 
 # System Libs
 mkdir -p $INSTALL/usr/lib
-  cp $PKG_BUILD/arch/$ARCH/usr/$LIBDIR/libati*.so $INSTALL/usr/lib
-  cp $PKG_BUILD/arch/$ARCH/usr/$LIBDIR/libatiuki.so* $INSTALL/usr/lib/libatiuki.so.1
-  cp $PKG_BUILD/arch/$ARCH/usr/X11R6/$LIBDIR/libati*.so* $INSTALL/usr/lib
-  cp $PKG_BUILD/arch/$ARCH/usr/X11R6/$LIBDIR/libfglrx*.so* $INSTALL/usr/lib
+  cp $PKG_BUILD/arch/$FGLRX_ARCH/usr/$LIBDIR/libati*.so $INSTALL/usr/lib
+  cp $PKG_BUILD/arch/$FGLRX_ARCH/usr/$LIBDIR/libatiuki.so* $INSTALL/usr/lib/libatiuki.so.1
+  cp $PKG_BUILD/arch/$FGLRX_ARCH/usr/X11R6/$LIBDIR/libati*.so* $INSTALL/usr/lib
+  cp $PKG_BUILD/arch/$FGLRX_ARCH/usr/X11R6/$LIBDIR/libfglrx*.so* $INSTALL/usr/lib
 
 if [ "$VAAPI" = yes ]; then
   $SCRIPTS/install xvba-video
 
-  cp $PKG_BUILD/arch/$ARCH/usr/X11R6/$LIBDIR/libAMDXvBA.cap $INSTALL/usr/lib
-  cp $PKG_BUILD/arch/$ARCH/usr/X11R6/$LIBDIR/libAMDXvBA.so* $INSTALL/usr/lib/libAMDXvBA.so.1
-  cp $PKG_BUILD/arch/$ARCH/usr/X11R6/$LIBDIR/libXvBAW.so* $INSTALL/usr/lib/libXvBAW.so.1
+  cp $PKG_BUILD/arch/$FGLRX_ARCH/usr/X11R6/$LIBDIR/libAMDXvBA.cap $INSTALL/usr/lib
+  cp $PKG_BUILD/arch/$FGLRX_ARCH/usr/X11R6/$LIBDIR/libAMDXvBA.so* $INSTALL/usr/lib/libAMDXvBA.so.1
+  cp $PKG_BUILD/arch/$FGLRX_ARCH/usr/X11R6/$LIBDIR/libXvBAW.so* $INSTALL/usr/lib/libXvBAW.so.1
 fi