[Bobs-cvs] CVS: bobs/cron Makefile.am,1.2,1.3 Makefile.in,1.1,1.2 backup.php.in,1.5,1.6 check_loop.in,1.2,1.3

[Joe Z. <jz...@us...>]

Update of /cvsroot/bobs/bobs/cron
In directory sc8-pr-cvs1:/tmp/cvs-serv1209/bobs/cron

Modified Files:
	Makefile.am Makefile.in backup.php.in check_loop.in 
Log Message:
All installed files now fall under ${prefix} and ${DESTDIR}. This should 
help with 'make rpm'.


Index: Makefile.am
===================================================================
RCS file: /cvsroot/bobs/bobs/cron/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile.am	3 Feb 2003 05:47:05 -0000	1.2
+++ Makefile.am	5 Feb 2003 02:05:22 -0000	1.3
@@ -19,18 +19,30 @@
 
 # Add 'check_loop' to crontab
 
+# Make the crontab directory (for testing distribution with 'make distcheck')
+	$(top_srcdir)/mkinstalldirs $(myCRONTABDIR)
+
 # backup crontab
-	cp -vp /etc/crontab /etc/crontab.bak
 # Copy back all but check_loop
-	grep -v current/process/check_loop /etc/crontab.bak > /etc/crontab
 # Add check_loop
-	echo '0-59/5 * * * * root $(myBOBSDATA)/current/process/check_loop' >> /etc/crontab
+	if test -f "$(myCRONTABDIR)/crontab"; then \
+		cp -vp $(myCRONTABDIR)/crontab $(myCRONTABDIR)/crontab.bak; \
+		grep -v current/process/check_loop \
+			$(myCRONTABDIR)/crontab.bak > $(myCRONTABDIR)/crontab; \
+	echo '0-59/5 * * * * root $(myBOBSDATA)/current/process/check_loop' \
+		>> $(myCRONTABDIR)/crontab; \
+	fi
 
 # Remove 'check_loop' from crontab
 
 uninstall-local:
 
 # backup crontab
-	cp -vp /etc/crontab /etc/crontab.bak
 # Copy back all but check_loop
-	grep -v current/process/check_loop /etc/crontab.bak > /etc/crontab
+	if test -f "$(myCRONTABDIR)/crontab"; then \
+		cp -vp $(myCRONTABDIR)/crontab $(myCRONTABDIR)/crontab.bak; \
+		grep -v current/process/check_loop $(myCRONTABDIR)/crontab.bak \
+			> $(myCRONTABDIR)/crontab; \
+	fi
+
+# END

Index: Makefile.in
===================================================================
RCS file: /cvsroot/bobs/bobs/cron/Makefile.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Makefile.in	3 Feb 2003 19:27:33 -0000	1.1
+++ Makefile.in	5 Feb 2003 02:05:22 -0000	1.2
@@ -77,9 +77,12 @@
 install_sh = @install_sh@
 myBOBSDATA = @myBOBSDATA@
 myCRONDIR = @myCRONDIR@
+myCRONTABDIR = @myCRONTABDIR@
 myHTTPDUSER = @myHTTPDUSER@
 myPASS = @myPASS@
 myWEBDIR = @myWEBDIR@
+myrealBOBSDATA = @myrealBOBSDATA@
+myrealWEBDIR = @myrealWEBDIR@
 
 crondir = $(myCRONDIR)
 
@@ -269,21 +272,33 @@
 
 # Add 'check_loop' to crontab
 
+# Make the crontab directory (for testing distribution with 'make distcheck')
+	$(top_srcdir)/mkinstalldirs $(myCRONTABDIR)
+
 # backup crontab
-	cp -vp /etc/crontab /etc/crontab.bak
 # Copy back all but check_loop
-	grep -v current/process/check_loop /etc/crontab.bak > /etc/crontab
 # Add check_loop
-	echo '0-59/5 * * * * root $(myBOBSDATA)/current/process/check_loop' >> /etc/crontab
+	if test -f "$(myCRONTABDIR)/crontab"; then \
+		cp -vp $(myCRONTABDIR)/crontab $(myCRONTABDIR)/crontab.bak; \
+		grep -v current/process/check_loop \
+			$(myCRONTABDIR)/crontab.bak > $(myCRONTABDIR)/crontab; \
+	echo '0-59/5 * * * * root $(myBOBSDATA)/current/process/check_loop' \
+		>> $(myCRONTABDIR)/crontab; \
+	fi
 
 # Remove 'check_loop' from crontab
 
 uninstall-local:
 
 # backup crontab
-	cp -vp /etc/crontab /etc/crontab.bak
 # Copy back all but check_loop
-	grep -v current/process/check_loop /etc/crontab.bak > /etc/crontab
+	if test -f "$(myCRONTABDIR)/crontab"; then \
+		cp -vp $(myCRONTABDIR)/crontab $(myCRONTABDIR)/crontab.bak; \
+		grep -v current/process/check_loop $(myCRONTABDIR)/crontab.bak \
+			> $(myCRONTABDIR)/crontab; \
+	fi
+
+# END
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:

Index: backup.php.in
===================================================================
RCS file: /cvsroot/bobs/bobs/cron/backup.php.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- backup.php.in	8 Jan 2003 15:55:50 -0000	1.5
+++ backup.php.in	5 Feb 2003 02:05:22 -0000	1.6
@@ -5,7 +5,7 @@
 // Can't get siteroot from class_config because this file
 // is in a cron directory, not the bobs site root.
 
-$siteroot = '@myWEBDIR@';                        
+$siteroot = '@myrealWEBDIR@';                        
 
 require($siteroot . '/inc/class_config.php');
 require($siteroot . '/inc/class_server.php');

Index: check_loop.in
===================================================================
RCS file: /cvsroot/bobs/bobs/cron/check_loop.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- check_loop.in	3 Feb 2003 19:35:02 -0000	1.2
+++ check_loop.in	5 Feb 2003 02:05:22 -0000	1.3
@@ -6,7 +6,7 @@
 #                It returned blank on my system.
 
 # This is a path that needs to be set!
-CMDLOOP_DIR='@myBOBSDATA@/current/process'
+CMDLOOP_DIR='@myrealBOBSDATA@/current/process'
 
 CMDLOOP_PID=`/sbin/pidof -x cmdloop`