[DRBD-cvs] documentation by phil; Updates to the doc build system by LGE.

drbd-user@lists.linbit.com drbd-user@lists.linbit.com
Tue, 3 Feb 2004 09:42:02 +0100 (CET)


DRBD CVS committal

Author  : phil
Project : drbd
Module  : documentation

Dir     : drbd/documentation


Modified Files:
      Tag: rel-0_7-branch
	Makefile Makefile.lang drbdadm.sgml 


Log Message:
Updates to the doc build system by LGE.

===================================================================
RCS file: /var/lib/cvs/drbd/drbd/documentation/Makefile,v
retrieving revision 1.17.2.7
retrieving revision 1.17.2.8
diff -u -3 -r1.17.2.7 -r1.17.2.8
--- Makefile	30 Oct 2003 08:12:38 -0000	1.17.2.7
+++ Makefile	3 Feb 2004 08:41:57 -0000	1.17.2.8
@@ -31,6 +31,8 @@
 DB2PDF          := $(shell which 2>/dev/null docbook2pdf)
 DB2PS           := $(shell which 2>/dev/null docbook2ps)
 
+MANPAGES       := drbdsetup.8 drbd.conf.5 drbd.8 datadisk.8 drbdadm.8
+
 ####### Implicit rules
 
 .SUFFIXES: .sgml .5 .8 .html .pdf .ps
@@ -85,31 +87,27 @@
 prepare:
 	@ set -e; for i in $(LANGS); do ln -sf ../Makefile.lang $$i/Makefile; done
 
-man:	drbdsetup.8 drbd.conf.5 drbd.8 datadisk.8 drbdadm.8
+man:	$(MANPAGES)
 	@ set -e; for i in $(LANGS); do $(MAKE) -C $$i man; done	
 
 HOWTO/index.html: HOWTO/DRBD-HOWTO.sgml
 	cd HOWTO ; $(DB2HTML) DRBD-HOWTO.sgml ; cd ..
 
 install:
-	@ok=true; for f in drbdsetup.8 drbd.conf.5 drbd.8 datadisk.8 ; \
+	@ok=true; for f in $(MANGAOES) ; \
 		do [ -e $$f ] || { echo $$f missing ; ok=false; } ; \
 	done ; $$ok
-	install -d $(PREFIX)/usr/share/man/man8
-	install -m 644 drbdsetup.8 $(PREFIX)/usr/share/man/man8
-	install -d $(PREFIX)/usr/share/man/man5
-	install -m 644 drbd.conf.5 $(PREFIX)/usr/share/man/man5
-	install -d $(PREFIX)/usr/share/man/man8
-	install -m 644 drbd.8 $(PREFIX)/usr/share/man/man8
-	install -d $(PREFIX)/usr/share/man/man8
-	install -m 644 datadisk.8 $(PREFIX)/usr/share/man/man8
+	@ set -e; for f in $(MANPAGES) ; do \
+		s=$${f##*.}; \
+		install -v -D -m 644 $$f $(PREFIX)usr/share/man/man$$s/$$f ; \
+	done
 	@ set -e; for i in $(LANGS); do $(MAKE) -C $$i install; done
 
 uninstall:
-	rm $(PREFIX)/usr/share/man/man8/drbdsetup.8
-	rm $(PREFIX)/usr/share/man/man5/drbd.conf.5
-	rm $(PREFIX)/usr/share/man/man8/drbd.8
-	rm $(PREFIX)/usr/share/man/man8/datadisk.8
+	@ set -e; for f in $(MANPAGES) ; do \
+		s=$${f##*.}; \
+		rm -v $(PREFIX)usr/share/man/man$$s/$$f ; \
+	done
 	@ set -e; for i in $(LANGS); do $(MAKE) -C $$i uninstall; done
 
 html:	prepare $(shell ls *.sgml | sed s/sgml/html/g)	
@@ -118,3 +116,5 @@
 	@ set -e; for i in $(LANGS); do $(MAKE) -C $$i pdf; done	
 ps:	prepare $(shell ls *.sgml | sed s/sgml/ps/g)
 	@ set -e; for i in $(LANGS); do $(MAKE) -C $$i ps; done	
+
+
===================================================================
RCS file: /var/lib/cvs/drbd/drbd/documentation/Makefile.lang,v
retrieving revision 1.3.2.2
retrieving revision 1.3.2.3
diff -u -3 -r1.3.2.2 -r1.3.2.3
--- Makefile.lang	12 Jan 2004 19:49:41 -0000	1.3.2.2
+++ Makefile.lang	3 Feb 2004 08:41:57 -0000	1.3.2.3
@@ -19,7 +19,7 @@
 #
 
 C_LANG=$(shell basename `pwd`)
-TARGETS=drbd.conf.5 drbdsetup.8 drbd.8 datadisk.8
+MANPAGES=drbd.conf.5 drbdsetup.8 drbd.8 datadisk.8
 
 DB2MAN          := $(shell which 2>/dev/null docbook2man)
 DB2HTML         := $(shell which 2>/dev/null docbook2html)
@@ -51,7 +51,7 @@
 
 #######
 
-man:	$(TARGETS)
+man:	$(MANPAGES)
 
 all:	man HOWTO/index.html
 
@@ -63,10 +63,10 @@
 	rm -f *.ps.gz *.pdf *.ps *.html
 
 install:
-	install -D drbdsetup.8 $(PREFIX)usr/share/man/$(C_LANG)/man8/drbdsetup.8
-	install -D drbd.conf.5 $(PREFIX)usr/share/man/$(C_LANG)/man5/drbd.conf.5
-	install -D drbd.8 $(PREFIX)usr/share/man/$(C_LANG)/man8/drbd.8
-	install -D datadisk.8 $(PREFIX)usr/share/man/$(C_LANG)/man8/datadisk.8
+	install -D -m 644 drbdsetup.8 $(PREFIX)usr/share/man/$(C_LANG)/man8/drbdsetup.8
+	install -D -m 644 drbd.conf.5 $(PREFIX)usr/share/man/$(C_LANG)/man5/drbd.conf.5
+	install -D -m 644 drbd.8 $(PREFIX)usr/share/man/$(C_LANG)/man8/drbd.8
+	install -D -m 644 datadisk.8 $(PREFIX)usr/share/man/$(C_LANG)/man8/datadisk.8
 
 uninstall:
 	rm $(PREFIX)usr/share/man/$(C_LANG)/man8/drbdsetup.8
===================================================================
RCS file: /var/lib/cvs/drbd/drbd/documentation/Attic/drbdadm.sgml,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -3 -r1.1.2.1 -r1.1.2.2
--- drbdadm.sgml	25 Aug 2003 14:22:55 -0000	1.1.2.1
+++ drbdadm.sgml	3 Feb 2004 08:41:57 -0000	1.1.2.2
@@ -24,6 +24,7 @@
 	<arg choice=plain rep=repeat><replaceable>resource</replaceable></arg>
       </group>
     </cmdsynopsis>
+  </refsynopsisdiv>
 
   <refsect1>
     <title>Description</title>