Wieder einige Packages ready

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

SysBuild/development/ddd

@@ -78,20 +78,20 @@ premk() {
 mk() {
 	if [ "$MK64BIT" == "true" ]; then
 		ADDOPTIONS="--with-motif-libraries=/usr/X11R7/lib64"
-		#mv /usr/X11R7/lib /usr/X11R7/lib.store
 		ldconfig
 	fi
 	CC="gcc $BUILDOPTIONS" \
 	CXX="g++ $BUILDOPTIONS" \
+	LDFLAGS="-L/usr/X11R7/lib64" \
 	./configure --target=$TARGET \
 		    --with-x \
 		    $ADDOPTIONS \
 		    --prefix=/usr/X11R7
-	make -j $NUMCPU
+	cp /usr/X11R7/include/Xm/XmP.h{,.orig}
+	sed -i -e "s%\(#include <Xm/VendorSP.h>\)%//\1%" /usr/X11R7/include/Xm/XmP.h
+	make -j $NUMCPU LIBXM=/usr/X11R7/lib64/libXm.so
 	make -j $NUMCPU DESTDIR=$TMPROOT install
-	#if [ "$MK64BIT" == "true" ]; then
-		#mv /usr/X11R7/lib.store /usr/X11R7/lib
-	#fi
+	mv /usr/X11R7/include/Xm/XmP.h.orig /usr/X11R7/include/Xm/XmP.h
 }
 
 postmk() {

SysBuild/guibased/nedit

@@ -68,30 +68,22 @@
 #
 
 #Pfad zum Basis-Sourcetree eintragen !
-SRCPATH=X11/Utilities
+SRCPATH=GuiBased/Apps
 
 #Funktion wird nach dem Entpacken der Sourcen, im Tree der Sourcen
 #ausgeführt (sprich unpack src; cd src; premk)
 #Hier kann z.B. das Makefile gepatcht werden (SED lässt grüssen
 
 premk() {
-	sed -e "s%-lXm %/usr/X11R7/lib/libXm.a %" \
-	        makefiles/Makefile.linux >/tmp/Makefile
-	sed -e "s/CFLAGS=/CFLAGS=-DBUILD_UNTESTED_NEDIT/" \
-		/tmp/Makefile >makefiles/Makefile.linux
-	X11R7_Fix
+	echo "Nothing to do for premk()"
 }
 
 #Hier wird der Make Prozess der Sourcen definiert
 mk() {
-	if [ "$MK64BIT" == "true" ]; then
-		export LDFLAGS="-L/usr/lib64 -L/usr/X11R7/lib64"
-		sed -e "s%/lib %/lib64 %g" makefiles/Makefile.linux >/tmp/Makefile
-		sed -e "s%/lib/%/lib64/%g" /tmp/Makefile >makefiles/Makefile.linux
-	fi
 	yes|make -j $NUMCPU \
-	         CC="gcc $BUILDOPTIONS" \
-		 CXX="g++ $BUILDOPTIONS" \
+	         CC="gcc $BUILDOPTIONS -I/usr/X11R7/include" \
+		 CXX="g++ $BUILDOPTIONS -I/usr/X11R7/include" \
+		 CFLAGS="-DBUILD_UNTESTED_NEDIT -L/usr/X11R7/lib64" \
 		 linux
 	mkdir -p $TMPROOT/usr/X11R7/bin $TMPROOT/usr/X11R7/man/man1
 	cp source/nedit $TMPROOT/usr/X11R7/bin

SysBuild/tools/docbookx

@@ -69,7 +69,7 @@
 #
 
 #Pfad zum Basis-Sourcetree :
-SRCPATH=X11/Utilities
+SRCPATH=Tools/Utilities
 
 #Wenn das usgepackte Verzeichnis vom Paketnamen unterschiedlich ist
 #SRCDIR=<PFAD>
@@ -83,7 +83,6 @@ mk() {
 	# Make install Optionen eintragen
 	make CC="gcc $BUILDOPTIONS" -j $NUMCPU install
 	make -j $NUMCPU DESTDIR="$TMPROOT/usr/share/xml/docbook/xml-dtd-\$(VERSION)" install
-	CheckError "Make install process failed !" 1
 	mkdir -p $TMPROOT/etc/xml
 	mv /etc/xml/* $TMPROOT/etc/xml
 	rm -r /etc/xml