From 7f90a471e368f718da7dd10f141a3019bfccbcc0 Mon Sep 17 00:00:00 2001
From: kueller <kueller@504e572c-2e33-0410-9681-be2bf7408885>
Date: Wed, 20 Jan 2010 18:31:01 +0000
Subject: [PATCH] gnuplot ready

git-svn-id: svn://svn.compuextreme.de/Viitor/V962/ViitorMake@5168 504e572c-2e33-0410-9681-be2bf7408885
---
 SysBuild/BuildCluster/Apps.dmk       |  1 +
 SysBuild/{tools => guibased}/gnuplot | 14 +++++---------
 2 files changed, 6 insertions(+), 9 deletions(-)
 rename SysBuild/{tools => guibased}/gnuplot (88%)

diff --git a/SysBuild/BuildCluster/Apps.dmk b/SysBuild/BuildCluster/Apps.dmk
index 5af4a1c..59a1ba2 100644
--- a/SysBuild/BuildCluster/Apps.dmk
+++ b/SysBuild/BuildCluster/Apps.dmk
@@ -32,3 +32,4 @@
 0	tools/tetex-texmfsrc
 0	tools/tetex-src
 0	tools/tetex-cm-super
+0	guibased/gnuplot
diff --git a/SysBuild/tools/gnuplot b/SysBuild/guibased/gnuplot
similarity index 88%
rename from SysBuild/tools/gnuplot
rename to SysBuild/guibased/gnuplot
index 7438363..1aafb0c 100644
--- a/SysBuild/tools/gnuplot
+++ b/SysBuild/guibased/gnuplot
@@ -69,12 +69,10 @@
 #
 #
 
-SRCPATH=Tools/Utilities
+SRCPATH=GuiBased/Apps
 
 premk() {
-	mv term/pdf.trm term/pdf.trm.orig
-	sed -e "s/PDF_open_fp(myPDF, gpoutfile)/PDF_open_file(myPDF, outstr)/g" term/pdf.trm.orig >term/pdf.trm
-	# Workaround http://www.cs.ucl.ac.uk/staff/W.Langdon/fandf/p/gnuplot4_gif_pdf.html
+	echo "Nothing to do for premk()"
 }
 
 mk() {
@@ -82,15 +80,13 @@ mk() {
 	CXX="g++ $BUILDOPTIONS" \
 	./configure --target=$TARGET \
 		    --prefix=/usr \
+		    --libdir=\${prefix}/$LIBDIR \
 		    --libexecdir=\${prefix}/bin \
 		    --without-tutorial
 	make -j $NUMCPU
-	make -j $NUMCPU DESTDIR=$TMPROOT install
+	make -k -j $NUMCPU DESTDIR=$TMPROOT install
 }
 
 postmk() {
-	mv $TMPROOT/usr/bin/gnuplot $TMPROOT/usr/bin/gnuplot.dir
-	mv $TMPROOT/usr/bin/gnuplot.dir/gnuplot $TMPROOT/usr/bin
-	mv $TMPROOT/usr/bin/gnuplot.dir/*/gnuplot_x11 $TMPROOT/usr/bin
-	rm -r $TMPROOT/usr/bin/gnuplot.dir
+	echo "Nothing to do for postmk()"
 }