[Box Backup-commit] COMMIT r2362 - box/trunk/docs

boxbackup-dev@boxbackup.org boxbackup-dev@boxbackup.org
Sun, 26 Oct 2008 15:43:29 +0000 (GMT)


Author: jamesog
Date: 2008-10-26 15:43:28 +0000 (Sun, 26 Oct 2008)
New Revision: 2362

Modified:
   box/trunk/docs/
   box/trunk/docs/Makefile
Log:
 * Create man pages in man/ instead of man-pages/ (slightly more standard location)
 * Fix a bug in the creation of the HTML man pages dir
 * Make the output quieter (don't display commands when making)




Property changes on: box/trunk/docs
___________________________________________________________________
Modified: svn:ignore
   - *.5
*.8
*.html
bb-man.xsl
box-html
man-pages
ExceptionCodes.xml

   + *.5
*.8
*.html
bb-man.xsl
box-html
man
ExceptionCodes.xml


Modified: box/trunk/docs/Makefile
===================================================================
--- box/trunk/docs/Makefile	2008-10-24 21:08:27 UTC (rev 2361)
+++ box/trunk/docs/Makefile	2008-10-26 15:43:28 UTC (rev 2362)
@@ -44,13 +44,13 @@
 $(MANXSL): $(MANXSL).tmpl
 	@sed -e 's,%%DOCBOOK%%,$(DOCBOOK),' $(MANXSL).tmpl > $(MANXSL)
 
-man-dirs: man-pages/.there $(HTMLPREFIX)/man-html/.there
+man-dirs: man/.there $(HTMLPREFIX)/man-html/.there
 
 $(HTMLPREFIX)/man-html/.there:
-	if [ ! -d man-html ]; then mkdir -p $(HTMLPREFIX)/man-html; touch $(HTMLPREFIX)/man-html/.there; fi
+	if [ ! -d $(HTMLPREFIX)/man-html ]; then mkdir -p $(HTMLPREFIX)/man-html; touch $(HTMLPREFIX)/man-html/.there; fi
 
-man-pages/.there:
-	if [ ! -d man-pages ]; then mkdir man-pages; touch man-pages/.there; fi
+man/.there:
+	if [ ! -d man ]; then mkdir man; touch man/.there; fi
 
 man-nroff: bbackupd.8 bbackupd-config.8 bbackupctl.8 bbackupquery.8 \
 	bbstored.8 bbstored-config.8 bbstoreaccounts.8 bbstored-certs.8 \
@@ -63,21 +63,21 @@
 	bbackupd.conf.html bbstored.conf.html raidfile.conf.html
 
 .xml.html:
-	$(DBPROC) -o $@ $(NOCHUNKBOOKXSL) $<
-	cp $@ $(HTMLPREFIX)/man-html/.
+	@$(DBPROC) -o $@ $(NOCHUNKBOOKXSL) $<
+	@cp $@ $(HTMLPREFIX)/man-html/.
 
 .xml.8 .xml.5:
-	$(DBPROC) -o $@ $(MANXSL) $<
-	cp $@ man-pages/
-	rm -f man-pages/$@.gz
-	gzip -f -9 man-pages/$@
+	@$(DBPROC) -o $@ $(MANXSL) $<
+	@cp $@ man/
+	@rm -f man/$@.gz
+	@gzip -f -9 man/$@
 
 dockit: clean docs
 	tar zcf documentation-kit-0.10.tar.gz $(HTMLPREFIX)/
 
 clean:
 	if [ -d ./$(HTMLPREFIX) ]; then rm -rf $(HTMLPREFIX) ; fi
-	if [ -d ./man-pages ]; then  rm -rf ./man-pages/; fi
+	if [ -d ./man ]; then  rm -rf ./man/; fi
 	if [ -f ExceptionCodes.xml ]; then rm ExceptionCodes.xml; fi
 	if [ -f documentation-kit-0.10.tar.gz ]; then rm documentation-kit-0.10.tar.gz; fi