[DRBD-cvs] documentation by lars; added SuSE-9.0 docbook magic to Makefile...

drbd-user@lists.linbit.com drbd-user@lists.linbit.com
Fri, 13 Feb 2004 14:44:23 +0100 (CET)


DRBD CVS committal

Author  : lars
Project : drbd
Module  : documentation

Dir     : drbd/documentation


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


Log Message:
added SuSE-9.0 docbook magic to Makefiles to make lmb happy again

===================================================================
RCS file: /var/lib/cvs/drbd/drbd/documentation/Makefile,v
retrieving revision 1.17.2.9
retrieving revision 1.17.2.10
diff -u -3 -r1.17.2.9 -r1.17.2.10
--- Makefile	9 Feb 2004 16:20:58 -0000	1.17.2.9
+++ Makefile	13 Feb 2004 13:44:18 -0000	1.17.2.10
@@ -26,13 +26,50 @@
 
 LANGS = ja pt_BR
 
-DB2MAN          := $(shell which 2>/dev/null docbook2man)
-DB2HTML         := $(shell which 2>/dev/null docbook2html)
-DB2PDF          := $(shell which 2>/dev/null docbook2pdf)
-DB2PS           := $(shell which 2>/dev/null docbook2ps)
+MAKEFILES_LANG := $(foreach dir,$(LANGS),$(dir)/Makefile)
 
 MANPAGES       := drbdsetup.8 drbd.conf.5 drbd.8 datadisk.8 drbdadm.8
 
+#
+# Docbook Magic for SuSE, Worksforme...
+# Needs to be explicitly enabled with make doc DIST=SuSE-9.0
+# requires these packages and their dependencies:
+#  docbook-dsssl-stylesheets docbook-toys
+#  docbook-utils docbook-utils opensp perl-SGMLS
+#
+ifeq ($(DIST),SuSE-9.0)
+  # dockbook2man just does not work.
+  # this does:
+  DB2MAN :=\
+  @_db2man() { in=$$1		;\
+   echo "  [DB2MAN] $$in"	;\
+   nsgmls "$$in" |\
+   sgmlspl /usr/share/sgml/docbook/utils-0.6.6/helpers/docbook2man-spec.pl;\
+  }; _db2man
+  
+  # dockbook2html produces errors and swallows tables.
+  # db2html works, but in contrast do dockbook2man creates 
+  # a subdirectory and some extra files ...
+  # this works for me:
+  DB2HTML :=\
+  _db2html() { in=$$1; base=$${in%.sgml}		;\
+   echo " [DB2HTML] $$in"			;\
+   db2html "$$in"				;\
+   ln -sf t1.html $$base/index.html		;\
+   mv $$base/*.html .		                ;\
+   rm -rf $$base/   		                ;\
+  }; _db2html
+
+else
+
+ DB2MAN          := $(shell which 2>/dev/null docbook2man)
+ DB2HTML         := $(shell which 2>/dev/null docbook2html)
+ DB2PDF          := $(shell which 2>/dev/null docbook2pdf)
+ DB2PS           := $(shell which 2>/dev/null docbook2ps)
+
+endif
+
+
 ####### Implicit rules
 
 .SUFFIXES: .sgml .5 .8 .html .pdf .ps
@@ -80,18 +117,25 @@
 endif
 
 distclean:
-	rm -f *.[58] manpage.links manpage.refs *~ manpage.log HOWTO/*.html
-	rm -f *.ps.gz *.pdf *.ps *.html
+	rm -f *.[58] manpage.links manpage.refs *~ manpage.log
+	rm -f *.ps.gz *.pdf *.ps *.html pod2htm*
+	rm -f  HOWTO/{*.html,*.css,suse-*.dsl,CATALOG.local}
+	rm -rf HOWTO/{DRBD-HOWTO*,db2html*}/	# note the trailing slash
 	@ set -e; for i in $(LANGS); do ln -sf ../Makefile.lang $$i/Makefile ; $(MAKE) -C $$i clean ; rm $$i/Makefile ; done
 
-prepare:
-	@ set -e; for i in $(LANGS); do ln -sf ../Makefile.lang $$i/Makefile; done
+$(MAKEFILES_LANG): Makefile.lang
+	ln -sf ../Makefile.lang $@
+
+prepare: $(MAKEFILES_LANG)
+
+
+#	@ set -e; for i in $(LANGS); do ln -sf ../Makefile.lang $$i/Makefile; done
 
 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 ..
+	@cd HOWTO ; $(DB2HTML) DRBD-HOWTO.sgml ; cd ..
 
 install:
 	@ok=true; for f in $(MANPAGES) ; \
===================================================================
RCS file: /var/lib/cvs/drbd/drbd/documentation/Makefile.lang,v
retrieving revision 1.3.2.3
retrieving revision 1.3.2.4
diff -u -3 -r1.3.2.3 -r1.3.2.4
--- Makefile.lang	3 Feb 2004 08:41:57 -0000	1.3.2.3
+++ Makefile.lang	13 Feb 2004 13:44:18 -0000	1.3.2.4
@@ -21,10 +21,42 @@
 C_LANG=$(shell basename `pwd`)
 MANPAGES=drbd.conf.5 drbdsetup.8 drbd.8 datadisk.8
 
-DB2MAN          := $(shell which 2>/dev/null docbook2man)
-DB2HTML         := $(shell which 2>/dev/null docbook2html)
-DB2PDF          := $(shell which 2>/dev/null docbook2pdf)
-DB2PS           := $(shell which 2>/dev/null docbook2ps)
+#
+# Docbook Magic for SuSE, Worksforme...
+# Needs to be explicitly enabled with make doc DIST=SuSE-9.0
+# requires these packages and their dependencies:
+#  docbook-dsssl-stylesheets docbook-toys
+#  docbook-utils docbook-utils opensp perl-SGMLS
+#
+ifeq ($(DIST),SuSE-9.0)
+  # dockbook2man just does not work.
+  # this does:
+  DB2MAN :=\
+  @_db2man() { in=$$1		;\
+   echo "  [DB2MAN] $$in"	;\
+   nsgmls "$$in" |\
+   sgmlspl /usr/share/sgml/docbook/utils-0.6.6/helpers/docbook2man-spec.pl;\
+  }; _db2man
+  
+  # dockbook2html produces errors and swallows tables.
+  # db2html works, but in contrast do dockbook2man creates 
+  # a subdirectory and some extra files ...
+  # this works for me:
+  DB2HTML :=\
+  _db2html() { in=$$1; base=$${in%.sgml}		;\
+   echo " [DB2HTML] $$in"			;\
+   db2html "$$in"				;\
+   ln -sf t1.html $$base/index.html		;\
+  }; _db2html
+
+else
+
+ DB2MAN          := $(shell which 2>/dev/null docbook2man)
+ DB2HTML         := $(shell which 2>/dev/null docbook2html)
+ DB2PDF          := $(shell which 2>/dev/null docbook2pdf)
+ DB2PS           := $(shell which 2>/dev/null docbook2ps)
+
+endif
 
 ####### Implicit rules
 
===================================================================
RCS file: /var/lib/cvs/drbd/drbd/documentation/Attic/drbdadm.sgml,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -3 -r1.1.2.3 -r1.1.2.4
--- drbdadm.sgml	9 Feb 2004 20:58:51 -0000	1.1.2.3
+++ drbdadm.sgml	13 Feb 2004 13:44:18 -0000	1.1.2.4
@@ -66,6 +66,7 @@
 	</para></listitem>
       </varlistentry>
     </variablelist>
+  </refsect1>
   <refsect1>
     <title>Commands</title>
     <variablelist>