From 0b047051eedf8a6bf2c3e7cfb726f5863e337163 Mon Sep 17 00:00:00 2001
From: kueller <kueller@504e572c-2e33-0410-9681-be2bf7408885>
Date: Tue, 16 Aug 2011 17:36:34 +0000
Subject: [PATCH] Anpassungen an neue Version - DESTDIR funktioniert jetzt.
 *.desktop und icons werden nun richtig kopiert..

git-svn-id: svn://svn.compuextreme.de/Viitor/V963/ViitorMake@6189 504e572c-2e33-0410-9681-be2bf7408885
---
 SysBuild/guibased/rawtherapee | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/SysBuild/guibased/rawtherapee b/SysBuild/guibased/rawtherapee
index e9b9d5f..1ff8cf9 100644
--- a/SysBuild/guibased/rawtherapee
+++ b/SysBuild/guibased/rawtherapee
@@ -75,22 +75,22 @@ SRCPATH=GuiBased/Apps
 
 premk() {
 	mkdir -p $TMPROOT/opt/RawTherapee
+	mkdir -p $TMPROOT/usr/X11R7/share
+	mkdir -p $TMPROOT/usr/share
 	chmod 755 $TMPROOT/opt/RawTherapee
 }
 
 mk() {
 	cmake -DCMAKE_INSTALL_PREFIX=/opt/RawTherapee \
-	      -DCMAKE_C_FLAGS="${BUILDOPTIONS}" \
-	      -DCMAKE_CXX_FLAGS="${BUILDOPTIONS}" \
+	      -DCMAKE_C_FLAGS="${BUILDOPTIONS} -L/${LIBDIR} -L/usr/${LIBDIR} -L/usr/X11R7/${LIBDIR}" \
+	      -DCMAKE_CXX_FLAGS="${BUILDOPTIONS} -L/${LIBDIR} -L/usr/${LIBDIR} -L/usr/X11R7/${LIBDIR}" \
 	      . &&
 	make -j $NUMCPU
-	make -j $NUMCPU CMAKE_INSTALL_PREFIX=$TMPROOT/opt/RawTherapee \
-	                install
+	make -j $NUMCPU DESTDIR=$TMPROOT install
 }
 
 postmk() {
-	tar -C release -cf - .|tar -C $TMPROOT/opt/RawTherapee -xf -
 	GetSVN Viitor_RawTherapee $TMPROOT
-	find $TMPROOT/opt/RawTherapee ! -type l -exec chmod 755 {} \;
-	find $TMPROOT/opt/RawTherapee ! -type l -exec chown root:sys {} \;
+	tar -C $TMPROOT/opt/RawTherapee/share/ -cf - icons applications |tar -C $TMPROOT/usr/X11R7/share -xvf -
+	tar -C $TMPROOT/opt/RawTherapee/share/ -cf - doc|tar -C $TMPROOT/usr/share -xvf -
 }