[Lunar-commits] <moonbase> qt4: fix the XDG_DATA_DIRS if it's not already set

[Zachary McGrew]

commit 5148729a1bb7fedfb12ae5eb3a059d32e9c238ee
Author: Zachary McGrew <zmcgrew at lunar-linux.org>
Date:   Wed Dec 8 00:40:20 2010 -0800

    qt4: fix the XDG_DATA_DIRS if it's not already set
    
    This was throwing off gtk+-2 because it expects /usr/share, but this was only setting the Qt4 dir.
    
    Conflicts:
    
    	qt4-apps/qt4/BUILD
---
 qt4-apps/qt4/BUILD |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/qt4-apps/qt4/BUILD b/qt4-apps/qt4/BUILD
index 17801fc..e06855c 100644
--- a/qt4-apps/qt4/BUILD
+++ b/qt4-apps/qt4/BUILD
@@ -56,7 +56,11 @@
 
   echo export QTDIR=\"/usr\" > $SOURCE_DIRECTORY/qt4.rc  &&
   echo export PATH=\"'${PATH}':'${QTDIR}'/bin\" >> $SOURCE_DIRECTORY/qt4.rc  &&
+<<<<<<< HEAD
   echo export XDG_DATA_DIRS=\"'${XDG_DATA_DIRS}':/usr/share/\" >> $SOURCE_DIRECTORY/qt4.rc &&
+=======
+  echo export XDG_DATA_DIRS=\"'${XDG_DATA_DIRS:-/usr/share}':/usr/share/qt4\" >> $SOURCE_DIRECTORY/qt4.rc &&
+>>>>>>> 4a5d19d... qt4: fix the XDG_DATA_DIRS if it's not already set
   echo export PKG_CONFIG_PATH=\"'${PKG_CONFIG_PATH}':/usr/lib/qt4/pkgconfig\" >> $SOURCE_DIRECTORY/qt4.rc &&
 
   install -m644 $SOURCE_DIRECTORY/qt4.rc /etc/profile.d/