[Devil-linux-commit] build/scripts bzip2,1.15,1.16 dbus,1.1,1.2

[Heiko Z. <smi...@us...>]

Update of /cvsroot/devil-linux/build/scripts
In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv9613/scripts

Modified Files:
	bzip2 dbus 
Log Message:
use correct temp dir
fixed dbus install
added dbus init script


Index: dbus
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/dbus,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- dbus	20 Mar 2007 02:41:45 -0000	1.1
+++ dbus	21 Mar 2007 13:34:34 -0000	1.2
@@ -28,7 +28,7 @@
 case $1 in
     build )
 	if [ "$CONFIG_DBUS" = "y" ]; then
-	    ./configure --prefix=/usr --sysconfdir=/etc || exit 1
+	    ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var || exit 1
 	    make $PMAKE all || exit 1
 	    strip_debug
 	    
@@ -40,21 +40,24 @@
     install )
 	if [ "$CONFIG_DBUS" = "y" ]; then
 	    rm -rf $TMPDIR || exit 1
-            #mkdir -p $TMPDIR/usr/sbin || exit 1
-	    #mkdir -p $TMPDIR/usr/share/man/man8 || exit 1
-	    #mkdir -p $ETCDIR/etc/arpwatch || exit 1
 	    
 	    make install DESTDIR=$TMPDIR || exit 1
-	    exit 1
-	    make install-man DESTDIR=$TMPDIR || exit 1
-            copy_files $TMPDIR/usr $CDDIR/ || exit 1
+	    
+	    rm -rf $TMPDIR/usr/include || exit 1
+	    rm -f $TMPDIR/usr/lib/*.*a || exit 1
+	    rm -rf $TMPDIR/usr/lib/{dbus-1.0,pkgconfig} || exit 1
+            copy_docs $TMPDIR/usr  || exit 1
+            copy_files $TMPDIR/etc $ETCDIR/ || exit 1
+	    rm -rf $TMPDIR/etc || exit 1
+            copy_files $TMPDIR/ $CDDIR/ || exit 1
+
             rm -rf $TMPDIR || exit 1
 
-            cp $MYDIR/scripts/arpwatch $ETCDIR/etc/init.d || exit 1
-	    echo "# Start arpwatch?" >> $CONFIGFILE
-	    echo "START_ARPWATCH=no" >> $CONFIGFILE
+            cp $MYDIR/scripts/dbus $ETCDIR/etc/init.d || exit 1
+	    echo "# Start dbus?" >> $CONFIGFILE
+	    echo "START_DBUS=no" >> $CONFIGFILE
 	    echo >> $CONFIGFILE
-	    echo "HELP_$MYNAME=\"$MYNAME is a daemon which discover and monitor MAC changes on a local network\"" >> $SOFTWAREHELP
+	    echo "HELP_$MYNAME=\"$MYNAME is the Message bus daemon, it is required by some other programs\"" >> $SOFTWAREHELP
 	fi
     	;;
 

Index: bzip2
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/bzip2,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- bzip2	10 Jan 2007 02:12:00 -0000	1.15
+++ bzip2	21 Mar 2007 13:34:34 -0000	1.16
@@ -61,14 +61,15 @@
 		;;
 
 	install )
-		rm -rf $WORKDIR/tmp
-		mkdir -p $WORKDIR/tmp/{bin,lib,usr} || exit 1
-		make install PREFIX=$WORKDIR/tmp/usr || exit 1
-		fixbz2 $WORKDIR/tmp
-		copy_docs $WORKDIR/tmp
-		rm -rf $WORKDIR/tmp/usr/include || exit 1
-		rm -rf $WORKDIR/tmp/usr/lib/*.a || exit 1
-		cp -dpR $WORKDIR/tmp/* $CDDIR/ || exit 1
+		rm -rf $TMPDIR
+		mkdir -p $TMPDIR/{bin,lib,usr} || exit 1
+		make install PREFIX=$TMPDIR/usr || exit 1
+		fixbz2 $TMPDIR
+		copy_docs $TMPDIR
+		rm -rf $TMPDIR/usr/include || exit 1
+		rm -rf $TMPDIR/usr/lib/*.a || exit 1
+		cp -dpR $TMPDIR/* $CDDIR/ || exit 1
+		rm -rf $TMPDIR
 		;;
 
 	* )