argus-clients-3.0.0.rc.8 separate 'make install-doc'

[Gabriel L. Somlo]

Carter & All,

Here's a patch that would separate installation of the documentation
from the main 'make install'.

The main 'make install' installs the programs and man pages.
Separately, 'make install-docs' installs documentation under
$(docdir).

Please apply, unless there are strong feelings that documentation
beyond regular man pages should get installed by default as part of
the main package.

I'll send another similar one for argus-3.0.0.rc.10 shortly.

Thanks,
Gabriel
-------------- next part --------------
diff -NarU5 argus-clients-3.0.0.rc.8.orig/Makefile.in argus-clients-3.0.0.rc.8/Makefile.in
--- argus-clients-3.0.0.rc.8.orig/Makefile.in	2006-06-16 12:22:37.000000000 -0400
+++ argus-clients-3.0.0.rc.8/Makefile.in	2006-06-16 13:50:48.000000000 -0400
@@ -82,37 +82,19 @@
 		(mkdir -p $(DESTDIR)$(exec_prefix)/argus/lib; chmod 755 $(DESTDIR)$(exec_prefix)/argus/lib)
 
 	[ -d $(DESTDIR)$(exec_prefix)/argus/archive ] || \
 		(mkdir -p $(DESTDIR)$(exec_prefix)/argus/archive; chmod 755 $(DESTDIR)$(exec_prefix)/argus/archive)
 
-	[ -d $(DESTDIR)$(docdir) ] || \
-		(mkdir -p $(DESTDIR)$(docdir); chmod 755 $(DESTDIR)$(docdir))
-
-	[ -d $(DESTDIR)$(docdir)/html ] || \
-		(mkdir -p $(DESTDIR)$(docdir)/html; chmod 755 $(DESTDIR)$(docdir)/html)
-
-	[ -d $(DESTDIR)$(docdir)/html/man ] || \
-		(mkdir -p $(DESTDIR)$(docdir)/html/man; chmod 755 $(DESTDIR)$(docdir)/html/man)
-
 	@for i in  $(DIRS) ; do \
 		if [ -d $$i ] ; then \
 		echo "making in $$i"; \
 		cd $$i; \
 		make install; \
 		cd ..; \
 		fi; \
 	done
 
-	$(INSTALL) -m 0644 $(srcdir)/doc/FAQ $(DESTDIR)$(docdir)
-	$(INSTALL) -m 0644 $(srcdir)/doc/HOW-TO $(DESTDIR)$(docdir)
-	$(INSTALL) -m 0644 $(srcdir)/doc/html/man/*.html $(DESTDIR)$(docdir)/html/man
-
-	$(INSTALL) -m 0644 $(srcdir)/README $(DESTDIR)$(prefix)/argus
-	$(INSTALL) -m 0644 $(srcdir)/README $(DESTDIR)$(docdir)
-	$(INSTALL) -m 0644 $(srcdir)/COPYING $(DESTDIR)$(prefix)/argus
-	$(INSTALL) -m 0644 $(srcdir)/COPYING $(DESTDIR)$(docdir)
-
 	$(INSTALL) -m 0644 $(srcdir)/support/Config/rarc $(DESTDIR)$(prefix)/argus
 
 	$(INSTALL) -m 0755 $(srcdir)/bin/argusbug $(DESTDIR)@bindir@/argusbug
 
 	[ -d $(DESTDIR)@mandir@ ] || \
@@ -135,10 +117,31 @@
 		$(DESTDIR)@mandir@/man1/racluster.1
 	[ -d $(DESTDIR)@mandir@/man5 ] || \
 		(mkdir -p $(DESTDIR)@mandir@/man5; chmod 755 $(DESTDIR)@mandir@/man5)
 	$(INSTALL) -m 0644 $(srcdir)/man/man5/rarc.5 \
 		$(DESTDIR)@mandir@/man5/rarc.5
+install-doc:  force
+	make installdirs
+	[ -d $(DESTDIR)@prefix@ ] || \
+		(mkdir -p $(DESTDIR)@prefix@; chmod 755 $(DESTDIR)@prefix@)
+
+	[ -d $(DESTDIR)$(docdir) ] || \
+		(mkdir -p $(DESTDIR)$(docdir); chmod 755 $(DESTDIR)$(docdir))
+
+	[ -d $(DESTDIR)$(docdir)/html ] || \
+		(mkdir -p $(DESTDIR)$(docdir)/html; chmod 755 $(DESTDIR)$(docdir)/html)
+
+	[ -d $(DESTDIR)$(docdir)/html/man ] || \
+		(mkdir -p $(DESTDIR)$(docdir)/html/man; chmod 755 $(DESTDIR)$(docdir)/html/man)
+
+	$(INSTALL) -m 0644 $(srcdir)/doc/FAQ $(DESTDIR)$(docdir)
+	$(INSTALL) -m 0644 $(srcdir)/doc/HOW-TO $(DESTDIR)$(docdir)
+	$(INSTALL) -m 0644 $(srcdir)/doc/html/man/*.html $(DESTDIR)$(docdir)/html/man
+
+	$(INSTALL) -m 0644 $(srcdir)/README $(DESTDIR)$(docdir)
+	$(INSTALL) -m 0644 $(srcdir)/COPYING $(DESTDIR)$(docdir)
+
 uninstall:
 	rm -f $(DESTDIR)@bindir@/ra
 	rm -f $(DESTDIR)@bindir@/rabins
 	rm -f $(DESTDIR)@bindir@/racount
 	rm -f $(DESTDIR)@bindir@/rasort