Anpassungen nach cblfs dokumentation und an neue Version.

git-svn-id: svn://svn.compuextreme.de/Viitor/V962/ViitorMake@4634 504e572c-2e33-0410-9681-be2bf7408885

SysBuild/tools/dbus

@@ -70,54 +70,50 @@
 #Pfad zum Basis-Sourcetree :
 SRCPATH=Tools/System
 
+(( MKPKG = $MKPKG | 256 ))
+
 #Wenn das usgepackte Verzeichnis vom Paketnamen unterschiedlich ist
 #SRCDIR=<PFAD>
 
 
 premk() {
-	export STQTDIR=$QTDIR
+	sed -i "1i\#include <syslog.h>" dbus/dbus-sysdeps-util-unix.c &&
+	mkdir ../Build-dbus
+	cd ../Build-dbus
 }
 
 mk32() {
-	export QTDIR=`echo $QTDIR|sed -e "s/lib64/lib/"`
-	CC="gcc $BUILDOPTIONS32" \
-	CXX="g++ $BUILDOPTIONS32" \
-	./configure --target=$TARGET32 \
-        	    --prefix=/usr/X11R7 \
-		    --sysconfdir=/etc/sysconfig/dbus \
-		    --localstatedir=/var \
-		    --with-x &&
-	for i in `find . -name "Makefile"`; do
-		sed -e "s/lib64/lib/g" $i >/tmp/`basename $i`
-		mv /tmp/`basename $i` $i
-	done
-	make -j $NUMCPU  &&
-	make -j $NUMCPU  install &&
-	make -j $NUMCPU  DESTDIR=$TMPROOT install
-	make distclean
-	ClearHostSysNameing32 $TMPROOT
+	CC="gcc ${BUILDOPTIONS32}" USE_ARCH=32 \
+	../dbus*/configure --prefix=/usr \
+	            --sysconfdir=/etc/sysconfig/dbus \
+	            --libexecdir=/usr/lib/dbus-1.0 \
+		    --localstatedir=/var &&
+	make -j $NUMCPU &&
+	make -j $NUMCPU install &&
+	make -j $NUMCPU DESTDIR=$TMPROOT install &&
+	cd ../dbus* &&
+	rm -r ../Build-dbus &&
+	mkdir ../Build-dbus &&
+	cd ../Build-dbus
 }
 
 mk() {
 	if [ "$MK64BIT" == "true" ]; then
 		ADDOPTIONS="--libdir=\${prefix}/lib64"
 	fi
-	export QTDIR=$STQTDIR
-	unset STQTDIR
-	CC="gcc $BUILDOPTIONS" \
-	CXX="g++ $BUILDOPTIONS" \
-	./configure --target=$TARGET \
-        	    --prefix=/usr/X11R7 \
+	CC="gcc $BUILDOPTIONS" USE_ARCH=64 \
+	../dbus*/configure --prefix=/usr/X11R7 \
 		    $ADDOPTIONS \
 		    --sysconfdir=/etc/sysconfig/dbus \
-		    --localstatedir=/var \
-		    --with-x &&
+		    --localstatedir=/var &&
 	make -j $NUMCPU  &&
 	make -j $NUMCPU  install &&
 	make -j $NUMCPU  DESTDIR=$TMPROOT install
 }
 
 postmk() {
+	cd ../dbus*
+	rm -r ../Build-dbus
 	ClearHostSysNameing $TMPROOT
 	GetSVN Viitor_dbus $TMPROOT
 	cd $TMPROOT/etc/sysconfig/dbus/dbus-1