From 767a1cf625a0d01d4666291d6ffb072ca79e1ae0 Mon Sep 17 00:00:00 2001
From: segler <segler@504e572c-2e33-0410-9681-be2bf7408885>
Date: Wed, 18 May 2011 13:11:05 +0000
Subject: [PATCH] X11R6 problem fixed

git-svn-id: svn://svn.compuextreme.de/Viitor/V962/ViitorMake@6102 504e572c-2e33-0410-9681-be2bf7408885
---
 SysBuild/multimedia/cinelerra | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/SysBuild/multimedia/cinelerra b/SysBuild/multimedia/cinelerra
index 32c348b..d25211d 100644
--- a/SysBuild/multimedia/cinelerra
+++ b/SysBuild/multimedia/cinelerra
@@ -72,28 +72,22 @@
 SRCPATH=MultiMedia/Apps
 
 premk() {	
-#	mv global_config global_config.bak
-#	sed -e "s/^PREFIX = /PREFIX = \$(DESTDIR)/g" <global_config.bak >global_config
-#
-#	for i in `find . -name Makefile*`; do 
-#	  mv $i /tmp/makefile.$$
-#	  </tmp/makefile.$$ >$i sed -e "s/\/usr/\$(DESTDIR)\/usr/g"
-#	done
-#
-#	mkdir -p $TMPROOT/usr/bin $TMPROOT/usr/lib
-#
-	X11R7_Fix
-#	echo "nothing to do for premk()"
+	find . -type f -maxdepth 1 -exec sed -iORIG "s/X11R6/X11R7/g" {} \;
+	find ./cinelerra/ -type f -exec sed -iORIG "s/X11R6/X11R7/g" {} \;
 }
 
 mk() {
 	CC="gcc $BUILDOPTIONS" \
 	CXX="g++ $BUILDOPTIONS" \
+	LDFLAGS="-L/${LIBDIR} -L/usr/X11R7/${LIBDIR} -L/usr/${LIBDIR}" \
 	./configure --target=$TARGET \
 		    --sysconfdir=/etc/cinelerra \
 		    --prefix=/usr/X11R7
 
+	LDFLAGS="-L/${LIBDIR} -L/usr/X11R7/${LIBDIR} -L/usr/${LIBDIR}" \ 
 	make -j $NUMCPU
+
+	LDFLAGS="-L/${LIBDIR} -L/usr/X11R7/${LIBDIR} -L/usr/${LIBDIR}" \
 	make -j $NUMCPU install
 #	make -j $NUMCPU -f build/Makefile.cinelerra DESTDIR=$TMPROOT install
 	mkdir -p $TMPROOT/opt/cinelerra
@@ -104,6 +98,5 @@ postmk() {
 	mkdir -p $TMPROOT/usr/share/doc/
 	cp -a bin/doc $TMPROOT/usr/share/doc/cinerella
 	mv $TMPROOT/usr/share/doc/* $TMPROOT/usr/share/doc/cinerella 2>/dev/null
-
 }