argus-3.0.0.rc.10 separate install-doc patch

Gabriel L. Somlo somlo at cmu.edu
Fri Jun 16 14:10:31 EDT 2006


Here's the patch separating 'make install-doc' from the main 'make
install' for argus-3.0.0.rc.10.

This should go on *after* the previous patch fixing '-D' ...

Thanks,
Gabriel
-------------- next part --------------
diff -NarU5 argus-3.0.0.rc.10.orig/Makefile.in argus-3.0.0.rc.10/Makefile.in
--- argus-3.0.0.rc.10.orig/Makefile.in	2006-06-16 14:01:26.000000000 -0400
+++ argus-3.0.0.rc.10/Makefile.in	2006-06-16 14:06:17.000000000 -0400
@@ -76,28 +76,17 @@
 		(mkdir -p $(DESTDIR)$(exec_prefix)/argus; chmod 755 $(DESTDIR)$(exec_prefix)/argus)
 
 	[ -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))
-
 	@-for d in $(DIRS); \
 	do \
 		(cd $$d; echo "### Make install in" `pwd`;    \
 			$(MAKE) $(MFLAGS) install;    \
 			echo "### Done with" `pwd`);            \
 	done
 
-	$(INSTALL) -m 0644 $(srcdir)/doc/FAQ $(DESTDIR)$(docdir)
-	$(INSTALL) -m 0644 $(srcdir)/doc/HOW-TO $(DESTDIR)$(docdir)
-
-	$(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 0755 $(srcdir)/bin/argusbug $(DESTDIR)@bindir@/argusbug
 
 	[ -d $(DESTDIR)@mandir@ ] || \
 		(mkdir -p $(DESTDIR)@mandir@; chmod 755 $(DESTDIR)@mandir@)
 	[ -d $(DESTDIR)@mandir@/man5 ] || \
@@ -105,10 +94,24 @@
 	[ -d $(DESTDIR)@mandir@/man8 ] || \
 		(mkdir -p $(DESTDIR)@mandir@/man8; chmod 755 $(DESTDIR)@mandir@/man8)
 	$(INSTALL) -m 0644 $(srcdir)/man/man5/argus.conf.5 $(DESTDIR)@mandir@/man5/argus.conf.5
 	$(INSTALL) -m 0644 $(srcdir)/man/man8/argus.8 $(DESTDIR)@mandir@/man8/argus.8
 
+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))
+
+	$(INSTALL) -m 0644 $(srcdir)/doc/FAQ $(DESTDIR)$(docdir)
+	$(INSTALL) -m 0644 $(srcdir)/doc/HOW-TO $(DESTDIR)$(docdir)
+
+	$(INSTALL) -m 0644 $(srcdir)/README $(DESTDIR)$(docdir)
+	$(INSTALL) -m 0644 $(srcdir)/COPYING $(DESTDIR)$(docdir)
+
 uninstall:
 	rm -f $(DESTDIR)@mandir@/man5/argus.5
 	rm -f $(DESTDIR)@mandir@/man5/argus.conf.5
 	rm -f $(DESTDIR)@mandir@/man8/argus.8
 


More information about the argus mailing list