diff options
| -rw-r--r-- | Makefile | 1 | ||||
| -rw-r--r-- | doc/Makefile | 4 | ||||
| -rw-r--r-- | doc/user-guide/docbook.xsl | 2 | 
3 files changed, 6 insertions, 1 deletions
| @@ -17,6 +17,7 @@ subdirobjs = $(foreach dir,$(subdirs),$(dir)/$(dir).o)  CFLAGS += -Wall  all: $(OUTFILE) +	$(MAKE) -C doc  uninstall: uninstall-bin uninstall-doc  	@echo -e '\nmake uninstall does not remove files in '$(DESTDIR)$(ETCDIR)', you can use make uninstall-etc to do that.\n' diff --git a/doc/Makefile b/doc/Makefile index e3dde912..9b473df3 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -1,5 +1,9 @@  -include ../Makefile.settings +all: +	# Only build the docs if this is a bzr checkout +	test ! -d ../.bzr || $(MAKE) -C user-guide +  install:  	mkdir -p $(DESTDIR)$(MANDIR)/man8/ $(DESTDIR)$(MANDIR)/man5/  	install -m 0644 bitlbee.8 $(DESTDIR)$(MANDIR)/man8/ diff --git a/doc/user-guide/docbook.xsl b/doc/user-guide/docbook.xsl index cfb27702..9adff305 100644 --- a/doc/user-guide/docbook.xsl +++ b/doc/user-guide/docbook.xsl @@ -18,7 +18,7 @@  	</xsl:template>  	<xsl:template match="ircaction"> -		<xsl:text> * </xsl:text><xsl:value-of select="@nick"/><xsl:value-of select="normalize-space(.)"/><xsl:text>
</xsl:text> +		<xsl:text> * </xsl:text><xsl:value-of select="@nick"/><xsl:text> </xsl:text><xsl:value-of select="normalize-space(.)"/><xsl:text>
</xsl:text>  	</xsl:template>  	<xsl:template match="ircexample"> | 
