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 }