From 4b6c7543c8f88b7bcfabfd78eb57ad50e99ef091 Mon Sep 17 00:00:00 2001
From: kueller <kueller@504e572c-2e33-0410-9681-be2bf7408885>
Date: Wed, 24 Aug 2011 07:20:04 +0000
Subject: [PATCH] bei 64 Bit builds wird /usr/X11R7/lib/X11 nach
 /usr/X11R7/lib64 kopiert

git-svn-id: svn://svn.compuextreme.de/Viitor/V963/ViitorMake@6229 504e572c-2e33-0410-9681-be2bf7408885
---
 SysBuild/BuildCluster/Apps.dmk | 1 -
 SysBuild/multimedia/nas        | 4 +++-
 SysBuild/tools/isdn4k-utils    | 1 +
 SysBuild/xserv/rstart          | 5 ++++-
 SysBuild/xserv/x11perf         | 5 ++++-
 SysBuild/xserv/xfs             | 7 ++++++-
 SysBuild/xserv/xsm             | 5 ++++-
 7 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/SysBuild/BuildCluster/Apps.dmk b/SysBuild/BuildCluster/Apps.dmk
index dca90a6..8a9a6ca 100644
--- a/SysBuild/BuildCluster/Apps.dmk
+++ b/SysBuild/BuildCluster/Apps.dmk
@@ -8,7 +8,6 @@
 0	guibased/krusader
 0	guibased/k3b
 0	multimedia/taglib-extras
-0	development/qtscriptgenerator
 0	multimedia/amarok
 0	tools/busybox
 0	guibased/koffice
diff --git a/SysBuild/multimedia/nas b/SysBuild/multimedia/nas
index 342e6fb..d174106 100644
--- a/SysBuild/multimedia/nas
+++ b/SysBuild/multimedia/nas
@@ -134,5 +134,7 @@ mk() {
 #Funktion wird nach Ablauf des Make Prozesses ausgeführt, und kann
 #in $TMPROOT noch einiges korrigieren
 postmk() {
-	echo "Nothing to do for postmk()"
+	if [ "$MK64BIT" == "true" ]; then
+		tar -C $TMPROOT/usr/X11R7/lib -cf - X11 |tar -C $TMPROOT/usr/X11R7/lib64 -xvf -
+	fi
 }
diff --git a/SysBuild/tools/isdn4k-utils b/SysBuild/tools/isdn4k-utils
index 596c699..f02e685 100644
--- a/SysBuild/tools/isdn4k-utils
+++ b/SysBuild/tools/isdn4k-utils
@@ -100,6 +100,7 @@ mk() {
 	cd ..
 	cd capiinfo
 	autoconf
+	automake --add-missing
 	automake
 	cd ..
 	make -k CC="gcc $BUILDOPTIONS"
diff --git a/SysBuild/xserv/rstart b/SysBuild/xserv/rstart
index b3785f4..e9a4efb 100644
--- a/SysBuild/xserv/rstart
+++ b/SysBuild/xserv/rstart
@@ -88,5 +88,8 @@ mk() {
 }
 
 postmk() {
-	echo "Nothing to do for postmk()"
+	if [ "$MK64BIT" == "true" ]; then
+		mkdir $TMPROOT/usr/X11R7/lib64
+		tar -C $TMPROOT/usr/X11R7/lib -cf - X11|tar -C $TMPROOT/usr/X11R7/lib64 -xf -
+	fi
 }
diff --git a/SysBuild/xserv/x11perf b/SysBuild/xserv/x11perf
index 6bdad8b..5f0ec90 100644
--- a/SysBuild/xserv/x11perf
+++ b/SysBuild/xserv/x11perf
@@ -88,5 +88,8 @@ mk() {
 }
 
 postmk() {
-	echo "Nothing to do for postmk()"
+	if [ "$MK64BIT" == "true" ]; then
+		mkdir $TMPROOT/usr/X11R7/lib64
+		tar -C $TMPROOT/usr/X11R7/lib -cf - X11|tar -C $TMPROOT/usr/X11R7/lib64 -xf -
+	fi
 }
diff --git a/SysBuild/xserv/xfs b/SysBuild/xserv/xfs
index 2a7a996..6a0315c 100644
--- a/SysBuild/xserv/xfs
+++ b/SysBuild/xserv/xfs
@@ -89,5 +89,10 @@ mk() {
 }
 
 postmk() {
-	echo "Nothing to do for postmk()"
+	mkdir $TMPROOT/usr/X11R7/lib
+	mv $TMPROOT/etc/X11 $TMPROOT/usr/X11R7/lib
+	if [ "$MK64BIT" == "true" ]; then
+		mkdir $TMPROOT/usr/X11R7/lib64
+		tar -C $TMPROOT/usr/X11R7/lib -cf - X11|tar -C $TMPROOT/usr/X11R7/lib64 -xf -
+	fi
 }
diff --git a/SysBuild/xserv/xsm b/SysBuild/xserv/xsm
index c77603b..7ed0697 100644
--- a/SysBuild/xserv/xsm
+++ b/SysBuild/xserv/xsm
@@ -88,5 +88,8 @@ mk() {
 }
 
 postmk() {
-	echo "Nothing to do for postmk()"
+	if [ "$MK64BIT" == "true" ]; then
+		mkdir $TMPROOT/usr/X11R7/lib64
+		tar -C $TMPROOT/usr/X11R7/lib -cf - X11|tar -C $TMPROOT/usr/X11R7/lib64 -xf - 
+	fi
 }