[Bobs-cvs] CVS: bobs Makefile.am,1.8,1.9 Makefile.in,1.5,1.6

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

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

Modified Files:
	Makefile.am Makefile.in 
Log Message:
A few minor changes so 'make distcheck' will work.


Index: Makefile.am
===================================================================
RCS file: /cvsroot/bobs/bobs/Makefile.am,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- Makefile.am	22 Dec 2002 02:30:31 -0000	1.8
+++ Makefile.am	3 Feb 2003 05:51:42 -0000	1.9
@@ -12,6 +12,9 @@
 ##		aclocal;automake --add-missing;autoconf;./configure
 ## 12-18-2002 Joe Zacky
 ##		Use the pre-defined variables and such as much as possible.
+## 02-01-2003 Joe Zacky
+##              By using the builtins $(wildcard) and $(srcdir) I got
+##		'make distcheck' to complete successfully!
 #-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 
 # Subdirectories to also be built
@@ -27,7 +30,7 @@
 
 # The 'dist_' prefix tells 'make dist' to distribute these files.
 
-dist_html_DATA = *.php *.css
+dist_html_DATA = $(wildcard *.php *.css)
 
 #
 # Other files to be removed for maintainer (me)
@@ -41,7 +44,9 @@
 		install-sh	\
 		aclocal.m4
 
-.PHONY: uninstall-all
+.PHONY: uninstall-all install-data-local distclean-local uninstall-local \
+	installdirs
+
 
 install-data-local:
 
@@ -51,7 +56,9 @@
 
 # Create bobs data directories
 
-	./mkinstalldirs $(myBOBSDATA)/current/process/{cmd,mounts,session}
+	$(srcdir)/mkinstalldirs $(myBOBSDATA)/current/process/cmd \
+				$(myBOBSDATA)/current/process/mounts \
+				$(myBOBSDATA)/current/process/session
 
 # httpd process must be able to write to bobs data dirs
 # and some html directories, 
@@ -85,5 +92,6 @@
 uninstall-all:
 	rm -rf $(myWEBDIR)
 	rm -rf $(myBOBSDATA)
+	make -f cron/Makefile uninstall-local
 
 ## END

Index: Makefile.in
===================================================================
RCS file: /cvsroot/bobs/bobs/Makefile.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Makefile.in	22 Dec 2002 02:30:31 -0000	1.5
+++ Makefile.in	3 Feb 2003 05:51:42 -0000	1.6
@@ -96,7 +96,7 @@
 
 
 # The 'dist_' prefix tells 'make dist' to distribute these files.
-dist_html_DATA = *.php *.css
+dist_html_DATA = $(wildcard *.php *.css)
 
 
 #
@@ -451,7 +451,8 @@
 	uninstall-recursive
 
 
-.PHONY: uninstall-all
+.PHONY: uninstall-all install-data-local distclean-local uninstall-local \
+	installdirs
 
 install-data-local:
 
@@ -461,7 +462,9 @@
 
 # Create bobs data directories
 
-	./mkinstalldirs $(myBOBSDATA)/current/process/{cmd,mounts,session}
+	$(srcdir)/mkinstalldirs $(myBOBSDATA)/current/process/cmd \
+				$(myBOBSDATA)/current/process/mounts \
+				$(myBOBSDATA)/current/process/session
 
 # httpd process must be able to write to bobs data dirs
 # and some html directories, 
@@ -495,6 +498,7 @@
 uninstall-all:
 	rm -rf $(myWEBDIR)
 	rm -rf $(myBOBSDATA)
+	make -f cron/Makefile uninstall-local
 # 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: