[Devil-linux-commit] build/scripts apcupsd,1.4,1.5 netacct-mysql,1.7,1.8 cpqarrayd,1.10,1.11

[Bruce S. <bl...@us...>]

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

Modified Files:
	apcupsd netacct-mysql cpqarrayd 
Log Message:
Fix docs/man-pages going into the wrong directories.


Index: netacct-mysql
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/netacct-mysql,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- netacct-mysql	11 Jan 2004 14:43:04 -0000	1.7
+++ netacct-mysql	3 May 2004 15:33:36 -0000	1.8
@@ -39,6 +39,7 @@
 		mkdir -p $WORKDIR/tmp/usr/sbin || exit 1
 
 		make install DESTDIR=$WORKDIR/tmp
+		copy_docs $WORKDIR/tmp
 		mkdir -p $ETCDIR/etc || exit 1
 		cp -dpR $WORKDIR/tmp/usr $CDDIR || exit 1
 		cp -p $MYDIR/scripts/nacctd $ETCDIR/etc/init.d || exit 1
@@ -47,7 +48,6 @@
 		echo "START_$MYNAME=no" >> $CONFIGFILE
 		echo >> $CONFIGFILE
 		echo "HELP_$MYNAME=\"$MYNAME is a daemon that logs network traffic\"" >> $SOFTWAREHELP
-		copy_man
 
 		rm -rf $WORKDIR/tmp || exit 1
 	fi

Index: cpqarrayd
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/cpqarrayd,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- cpqarrayd	11 Jan 2004 14:43:04 -0000	1.10
+++ cpqarrayd	3 May 2004 15:33:36 -0000	1.11
@@ -35,8 +35,15 @@
 
 	install )
 		if [ "$CONFIG_CPQARRAYD" = "y" ]; then
-			mkdir -p $CDDIR/usr/lib || exit 1
-			make install DESTDIR=$CDDIR || exit 1
+			rm -rf $WORKDIR/tmp || exit 1
+			mkdir -p $WORKDIR/tmp || exit 1
+
+			make install DESTDIR=$WORKDIR/tmp || exit 1
+			copy_docs $WORKDIR/tmp
+			mkdir -p $CDDIR
+			copy_files $WORKDIR/tmp/usr $CDDIR/ || exit 1
+           
+			rm -rf $WORKDIR/tmp || exit 1
 		fi
 		;;
 

Index: apcupsd
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/apcupsd,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- apcupsd	8 Apr 2004 23:32:31 -0000	1.4
+++ apcupsd	3 May 2004 15:33:36 -0000	1.5
@@ -62,7 +62,7 @@
 			mkdir -p $ETCDIR/etc/apcupsd || exit 1
 			cp -dp $WORKDIR/tmp/etc/apcupsd/* $ETCDIR/etc/apcupsd/ || exit 1
 
-			copy_man $WORKDIR/tmp || exit 1
+			copy_docs $WORKDIR/tmp
 
 			copy_files $WORKDIR/tmp/usr $CDDIR/ || exit 1
 			copy_files $WORKDIR/tmp/sbin $CDDIR/ || exit 1