From 6c96b9381f423b975ba85f91bc3ea7fb03296561 Mon Sep 17 00:00:00 2001
From: kueller <kueller@504e572c-2e33-0410-9681-be2bf7408885>
Date: Mon, 21 Dec 2009 09:53:16 +0000
Subject: [PATCH] =?UTF-8?q?die=20ld.lib.conf=20geschichten=20geh=C3=B6ren?=
 =?UTF-8?q?=20in=20postinstall,=20nicht=20in=20gnome=20init=20script?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: svn://svn.compuextreme.de/Viitor/V962/Viitor_gnomeconf@4910 504e572c-2e33-0410-9681-be2bf7408885
---
 etc/sysconfig/profile.d/gnome | 8 --------
 tmp/postinstall               | 7 +++++++
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/etc/sysconfig/profile.d/gnome b/etc/sysconfig/profile.d/gnome
index 8e51ebc..66c9ff1 100644
--- a/etc/sysconfig/profile.d/gnome
+++ b/etc/sysconfig/profile.d/gnome
@@ -11,11 +11,3 @@ export PATH="${PATH}:${GNOME_PREFIX}/bin"
 export PKG_CONFIG_PATH="${PKG_CONFIG_PATH}${PKG_CONFIG_PATH+:}${GNOME_PREFIX}/lib/pkgconfig"
 export XDG_DATA_DIRS="${XDG_DATA_DIRS}${XDG_DATA_DIRS+:}${GNOME_PREFIX}/share"
 export XDG_CONFIG_DIRS="${XDG_CONFIG_DIRS}${XDG_CONFIG_DIRS+:}/etc/gnome/xdg"
-
-if ! grep -q "/opt/gnome/lib"; then
-	echo "/opt/gnome/lib" >>/etc/ld.so.conf
-	if -d /lib64; then
-		echo "/opt/gnome/lib64" >>/etc/ld.so.conf
-	fi
-fi
-
diff --git a/tmp/postinstall b/tmp/postinstall
index 9155b88..7ad484a 100644
--- a/tmp/postinstall
+++ b/tmp/postinstall
@@ -1 +1,8 @@
 sed -i "/<standard_session_servicedirs \/>/a\ <servicedir>/opt/ghome/share/dbus-1/services</servicedir>" /etc/sysconfig/dbus/dbus-1/session.conf
+
+if ! grep -q "/opt/gnome/lib" /etc/ld.so.conf; then
+	echo "/opt/gnome/lib" >>/etc/ld.so.conf
+	if [ -d /lib64 ]; then
+		echo "/opt/gnome/lib64" >>/etc/ld.so.conf
+	fi
+fi