Ready for compile

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

SysBuild/kde/kdelibs

@@ -77,37 +77,50 @@ premk() {
 	echo "Nothing do do for premk()"
 }
 
+mk32() {
+	mkdir -v build &&
+	cd build &&
+	USE_ARCH=32 \
+	CC="gcc $BUILDOPTIONS32" \
+	CXX="g++ $BUILDOPTIONS32" \
+	cmake -DCMAKE_INSTALL_PREFIX=${KDEDIR} \
+	      -DSYSCONF_INSTALL_DIR=/etc/kde \
+	      -DLIB_INSTALL_DIR=${KDEDIR}/lib \
+	      -DCMAKE_BUILD_TYPE=Release \
+	      -DCMAKE_C_FLAGS="${BUILDOPTIONS32}" \
+	      -DCMAKE_CXX_FLAGS="${BUILDOPTIONS32}" \
+	      -DLIB_SUFFIX= \
+	      .. &&
+	make -j $NUMCPU
+	make DESTDIR=$TMPROOT install
+	mv $TMPROOT/${KDEDIR}/bin/kde4-config{,-32}
+	cd ..
+	rm -r build
+}
+
 #Hier wird der Make Prozess der Sourcen definiert
 mk() {
-	if [ "$MK64BIT" == "true" ]; then
-		ADDOPTIONS="--libdir=\${prefix}/lib64"
-	fi
-	CC="gcc $BUILDOPTIONS" \
-	CXX="g++ $BUILDOPTIONS" \
+	mkdir -v build &&
+	cd build &&
 	USE_ARCH=$UARCH \
-	./configure $ADDOPTIONS \
-		    --prefix=/opt/kde 
-	#for i in `find . -name "Makefile"`; do
-		#sed -e "s%/usr/man%\$(DESTDIR)/\$(prefix)/man%" $i |
-		#sed -e "s%/usr/lib %/usr/$LIBDIR %" |
-		#sed -e "s%/usr/lib$%/usr/$LIBDIR%" >/tmp/Makefile
-		#mv /tmp/Makefile $i
-	#done
-	#Probleme mit gssapi - hier sind die libs nicht richtig gesetzt
-	#sed -e "s%^GSSAPI_LIBS.*$%GSSAPI_LIBS = -lgssapi_krb5%" \
-		#kioslave/http/Makefile >/tmp/Makefile
-	#mv /tmp/Makefile kioslave/http/Makefile
-	#sed -e "s%_ipp_free_attr%//_ipp_free_attr%" kdeprint/cups/ipprequest.cpp >/tmp/ipprequest.cpp
-	#mv /tmp/ipprequest.cpp kdeprint/cups/ipprequest.cpp
-	make -j $NUMCPU &&
-	make -j $NUMCPU DESTDIR=$TMPROOT install 
+	cmake -DCMAKE_INSTALL_PREFIX=${KDEDIR} \
+	      -DSYSCONF_INSTALL_DIR=/etc/kde \
+	      -DLIB_INSTALL_DIR=${KDEDIR}/$LIBDIR \
+	      -DCMAKE_BUILD_TYPE=Release \
+	      -DCMAKE_C_FLAGS="${BUILDOPTIONS}" \
+	      -DCMAKE_CXX_FLAGS="${BUILDOPTIONS}" \
+	      -DLIB_SUFFIX= \
+	      .. &&
+	make -j $NUMCPU
+	make DESTDIR=$TMPROOT install
+	if [ "$MK64BIT" == "true" ]; then
+		mv $TMPROOT/${KDEDIR}/bin/kde4-config{,-64}
+		ln -s /usr/bin/multiarch_wrapper $TMPROOT/${KDEDIR}/bin/kde4-config
+	fi
 }
 
 #Funktion wird nach Ablauf des Make Prozesses ausgeführt, und kann
 #in $TMPROOT noch einiges korrigieren
 postmk() {
-	cd $TMPROOT/opt/kde/bin
-	chmod 4755 artswrapper
-	cd -
-	ClearHostSysNameing $TMPROOT
+	echo "Nothing to do for postmk()"
 }