[Bobs-cvs] CVS: bobs/inc Makefile.am,1.2,1.3 Makefile.in,1.1,1.2 config.php.in,1.4,1.5

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

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

Modified Files:
	Makefile.am Makefile.in config.php.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/inc/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile.am	3 Feb 2003 05:51:42 -0000	1.2
+++ Makefile.am	5 Feb 2003 02:05:23 -0000	1.3
@@ -4,5 +4,4 @@
 
 dist_html_DATA = $(wildcard *.php *.pinc *.ini)
 
-uninstall-local:
-	rmdir $(htmldir)
+## END

Index: Makefile.in
===================================================================
RCS file: /cvsroot/bobs/bobs/inc/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:34 -0000	1.1
+++ Makefile.in	5 Feb 2003 02:05:24 -0000	1.2
@@ -75,9 +75,12 @@
 install_sh = @install_sh@
 myBOBSDATA = @myBOBSDATA@
 myCRONDIR = @myCRONDIR@
+myCRONTABDIR = @myCRONTABDIR@
 myHTTPDUSER = @myHTTPDUSER@
 myPASS = @myPASS@
 myWEBDIR = @myWEBDIR@
+myrealBOBSDATA = @myrealBOBSDATA@
+myrealWEBDIR = @myrealWEBDIR@
 SUBDIRS = excludes servers templates
 
 htmldir = $(myWEBDIR)/inc
@@ -325,7 +328,7 @@
 
 mostlyclean-am: mostlyclean-generic
 
-uninstall-am: uninstall-dist_htmlDATA uninstall-info-am uninstall-local
+uninstall-am: uninstall-dist_htmlDATA uninstall-info-am
 
 uninstall-info: uninstall-info-recursive
 
@@ -342,12 +345,8 @@
 	maintainer-clean-generic maintainer-clean-recursive mostlyclean \
 	mostlyclean-generic mostlyclean-recursive tags tags-recursive \
 	uninstall uninstall-am uninstall-dist_htmlDATA \
-	uninstall-info-am uninstall-info-recursive uninstall-local \
-	uninstall-recursive
-
+	uninstall-info-am uninstall-info-recursive uninstall-recursive
 
-uninstall-local:
-	rmdir $(htmldir)
 # 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: config.php.in
===================================================================
RCS file: /cvsroot/bobs/bobs/inc/config.php.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- config.php.in	24 Aug 2002 20:26:47 -0000	1.4
+++ config.php.in	5 Feb 2003 02:05:24 -0000	1.5
@@ -8,18 +8,18 @@
 
 // Base dir to do full current backups. This is where
 // the current backup will be stored.
-$sys_conf["backupdir"]		= '@myBOBSDATA@/current';
+$sys_conf["backupdir"]		= '@myrealBOBSDATA@/current';
 
 // Base dir to put backup files in. This is where files 
 // that have changed are moved to.
-$sys_conf["incomingdir"]	= '@myBOBSDATA@/incoming';	
+$sys_conf["incomingdir"]	= '@myrealBOBSDATA@/incoming';	
 
 // Base dir to store incremental backups. This is where
 // incremental backup files are stored.
-$sys_conf["incrementdir"]	= '@myBOBSDATA@/incremental';
+$sys_conf["incrementdir"]	= '@myrealBOBSDATA@/incremental';
 
 // root of the bobs site.
-$sys_conf["siteroot"]		= '@myWEBDIR@';
+$sys_conf["siteroot"]		= '@myrealWEBDIR@';
 
 // Server definition template