[Bobs-cvs] CVS: bobs/inc/servers Makefile.am,1.2,1.3 Makefile.in,1.1,1.2

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

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

Modified Files:
	Makefile.am Makefile.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/servers/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:24 -0000	1.3
@@ -3,5 +3,17 @@
 
 dist_html_DATA = $(wildcard *.ini)
 
-uninstall-local:
-	rmdir $(htmldir)
+install-data-local:
+
+# httpd process must be able to write to html server dirs
+# so make the httpd process own the directory
+
+	$(top_srcdir)/mkinstalldirs $(myWEBDIR)/inc/servers
+
+	if test -n "$(myHTTPDUSER)"; then \
+		chown -R $(myHTTPDUSER) $(myWEBDIR)/inc/servers; \
+	fi
+
+## END
+
+

Index: Makefile.in
===================================================================
RCS file: /cvsroot/bobs/bobs/inc/servers/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:35 -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@
 
 htmldir = $(myWEBDIR)/inc/servers
 
@@ -192,7 +195,7 @@
 
 info-am:
 
-install-data-am: install-dist_htmlDATA
+install-data-am: install-data-local install-dist_htmlDATA
 
 install-exec-am:
 
@@ -210,20 +213,29 @@
 
 mostlyclean-am: mostlyclean-generic
 
-uninstall-am: uninstall-dist_htmlDATA uninstall-info-am uninstall-local
+uninstall-am: uninstall-dist_htmlDATA uninstall-info-am
 
 .PHONY: all all-am check check-am clean clean-generic distclean \
 	distclean-generic distdir dvi dvi-am info info-am install \
-	install-am install-data install-data-am install-dist_htmlDATA \
-	install-exec install-exec-am install-info install-info-am \
-	install-man install-strip installcheck installcheck-am \
-	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-generic uninstall uninstall-am \
-	uninstall-dist_htmlDATA uninstall-info-am uninstall-local
+	install-am install-data install-data-am install-data-local \
+	install-dist_htmlDATA install-exec install-exec-am install-info \
+	install-info-am install-man install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	uninstall uninstall-am uninstall-dist_htmlDATA \
+	uninstall-info-am
 
 
-uninstall-local:
-	rmdir $(htmldir)
+install-data-local:
+
+# httpd process must be able to write to html server dirs
+# so make the httpd process own the directory
+
+	$(top_srcdir)/mkinstalldirs $(myWEBDIR)/inc/servers
+
+	if test -n "$(myHTTPDUSER)"; then \
+		chown -R $(myHTTPDUSER) $(myWEBDIR)/inc/servers; \
+	fi
 # 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: