From 81ac95e39fa537ae97de29e0cb59691873c3df59 Mon Sep 17 00:00:00 2001
From: kueller <kueller@504e572c-2e33-0410-9681-be2bf7408885>
Date: Tue, 12 Jan 2010 19:50:59 +0000
Subject: [PATCH] Falsche BUILDOPTIONS (BUILDOPTIONS64) korrigiert.
 PKG_CONFIG_DIR64 gibt bei Viitor nicht..

git-svn-id: svn://svn.compuextreme.de/Viitor/V962/ViitorMake@5068 504e572c-2e33-0410-9681-be2bf7408885
---
 SysBuild/kde/phonon | 6 +++---
 SysBuild/kde/strigi | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/SysBuild/kde/phonon b/SysBuild/kde/phonon
index 8b6f407..ba66cdf 100644
--- a/SysBuild/kde/phonon
+++ b/SysBuild/kde/phonon
@@ -113,13 +113,13 @@ mk() {
 	fi
 	mkdir -v build &&
 	cd build &&
-	USE_ARCH=64 PKG_CONFIG_PATH="${PKG_CONFIG_PATH64}" \
+	USE_ARCH=$UARCH \
 	cmake -DCMAKE_INSTALL_PREFIX=${KDEDIR} \
 	    -DSYSCONF_INSTALL_DIR=/etc/kde \
 	    -DLIB_INSTALL_DIR=${KDEDIR}/$LIBDIR \
 	    -DCMAKE_BUILD_TYPE=Release \
-	    -DCMAKE_C_FLAGS="${BUILDOPTIONS64}" \
-	    -DCMAKE_CXX_FLAGS="${BUILDOPTIONS64}" \
+	    -DCMAKE_C_FLAGS="${BUILDOPTIONS}" \
+	    -DCMAKE_CXX_FLAGS="${BUILDOPTIONS}" \
 	    -DX11_LIBRARY=/usr/X11R7/$LIBDIR \
 	    -DXEXT_LIBRARY=/usr/X11R7/$LIBDIR \
 	    -DOPENGL_INCLUDE_DIR=/usr/include/GL \
diff --git a/SysBuild/kde/strigi b/SysBuild/kde/strigi
index 28721e2..fe52f82 100644
--- a/SysBuild/kde/strigi
+++ b/SysBuild/kde/strigi
@@ -115,13 +115,13 @@ mk() {
 	fi
 	mkdir -v build &&
 	cd build &&
-	USE_ARCH=64 \
+	USE_ARCH=$UARCH \
 	cmake -DCMAKE_INSTALL_PREFIX=${KDEDIR} \
 	    -DSYSCONF_INSTALL_DIR=/etc/kde \
 	    -DLIB_INSTALL_DIR=${KDEDIR}/$LIBDIR \
 	    -DCMAKE_BUILD_TYPE=Release \
-	    -DCMAKE_C_FLAGS="${BUILDOPTIONS64}" \
-	    -DCMAKE_CXX_FLAGS="${BUILDOPTIONS64} -fpermissive" \
+	    -DCMAKE_C_FLAGS="${BUILDOPTIONS}" \
+	    -DCMAKE_CXX_FLAGS="${BUILDOPTIONS} -fpermissive" \
 	    -DOPENGL_INCLUDE_DIR=/usr/include/GL \
 	    -DOPENGL_gl_LIBRARY=/usr/X11R7/$LIBDIR \
 	    -DOPENGL_glu_LIBRARY=/usr/X11R7/$LIBDIR \