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

[Zachary McGrew]

commit cddec8f8b6d34fdb0446bf32331bb269805af6ad
Author: Zachary McGrew <zmcgrew at lunar-linux.org>
Date:   Wed Dec 8 01:18:44 2010 -0800

    Revert "qt4: fix the XDG_DATA_DIRS if it's not already set"
    
    This reverts commit 5fecdc389a03a7e67dc7cc2537a96342d6e92d6f.
    
    Somehow messed up merge again...
---
 qt4-apps/qt4/BUILD |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)

diff --git a/qt4-apps/qt4/BUILD b/qt4-apps/qt4/BUILD
index e06855c..17801fc 100644
--- a/qt4-apps/qt4/BUILD
+++ b/qt4-apps/qt4/BUILD
@@ -56,11 +56,7 @@
 
   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/