- Be a bit more verbose.

- Try some more possibilities when looking for 3.0 sources.
- Fix "make files"
(This used to be commit 0e33ad6b3b45a95868c64a80ff9e1e97ebe51c16)

6 files changed, 18 insertions, 10 deletions

diff --git a/docs/Makefile b/docs/Makefile
index f117b34b69..d3f2b1290b 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -1,5 +1,5 @@
 #################################################################
-# Makefile.in for Samba Documentation
+# Makefile for Samba Documentation
 # Authors:	
 # 		James Moore <jmoore@php.net>
 # 		Gerald Carter <jerry@samba.org>
@@ -172,6 +172,10 @@ $(PSDIR)/%.ps: $(DVIDIR)/%.dvi
 xslt/figures/%.pdf: xslt/figures/%.eps
 	$(EPSTOPDF) $<
 
+# RTF files
+$(RTFDIR)/%.rtf: $(DOCBOOKDIR)/%.xml
+	$(XSLTPROC) --output $@ http://docbook.sourceforge.net/release/xsl/current/fo/docbook.xsl $<
+
 # Fo
 $(FODIR)/%.fo: $(DOCBOOKDIR)/%.xml
 	mkdir -p $(@D)
@@ -190,7 +194,7 @@ $(HTMLHELPDIR)/%: $(DOCBOOKDIR)/%.xml
 # Plucker docs
 $(PLUCKERDIR)/%.pdb: $(HTMLDIR)/%.html 
 	mkdir -p $(@D)
-	$(PLUCKERBUILD) -v -M1 --stayonhost  --noimages --zlib-compression -H file:$< -f $* -p $(PLUCKERDIR)
+	$(PLUCKERBUILD) -v -V 2 --stayonhost --zlib-compression -f $* -p $(PLUCKERDIR) file:$< 
 
 # Manpages
 $(MANPAGEDIR)/smb.conf.5.xml: $(SMBDOTCONFDOC)/parameters.all.xml $(SMBDOTCONFDOC)/parameters.service.xml $(SMBDOTCONFDOC)/parameters.global.xml
@@ -241,7 +245,7 @@ undocumented: $(SMBDOTCONFDOC)/parameters.all.xml scripts/find_missing_doc.pl sc
 
 # Examples and the like
 
-files: $(HOWTODIR)/index.xml xslt/extract-smbfiles.xsl
+files: Samba-HOWTO-Collection/index.xml xslt/extract-smbfiles.xsl
 	$(XSLTPROC) xslt/extract-smbfiles.xsl $< > /dev/null
 
 samples: $(DOCBOOKDIR)/Samba-HOWTO-Collection.xml xslt/extract-examples.xsl scripts/indent-smb.conf.pl
diff --git a/docs/aclocal.m4 b/docs/aclocal.m4
index ec451a4968..a1d85ef5c4 100644
--- a/docs/aclocal.m4
+++ b/docs/aclocal.m4
@@ -44,6 +44,7 @@ dnl arg3: variable to store found path in
 dnl arg4: target that requires it
 
 AC_DEFUN(DOCS_TARGET_REQUIRE_DIR, [
+    AC_MSG_CHECKING([for $2])
 	AC_SUBST($3)
 	for I in $1; 
 	do 
@@ -56,5 +57,8 @@ AC_DEFUN(DOCS_TARGET_REQUIRE_DIR, [
 		else
 			$4_REQUIRES="$$4_REQUIRES $3"
 		fi
+		AC_MSG_RESULT([not found])
+	else
+		AC_MSG_RESULT([found in $$3])
 	fi
 ])
diff --git a/docs/configure.in b/docs/configure.in
index e4f79fbc18..4ee6f0e332 100644
--- a/docs/configure.in
+++ b/docs/configure.in
@@ -68,7 +68,7 @@ DOCS_TARGET_REQUIRE_PROGRAM(HTML2TEXT, html2text, TXT)
 DOCS_TARGET_REQUIRE_PROGRAM(PERL, perl, UNDOCUMENTED)
 DOCS_TARGET_REQUIRE_PROGRAM(XMLLINT, xmllint, VERIFY)
 DOCS_TARGET_REQUIRE_PROGRAM(FOP, fop, FOPDF)
-DOCS_TARGET_REQUIRE_DIR([$SPECIFIED_SOURCEDIR ..], [source/configure.in], SAMBASOURCEDIR, UNDOCUMENTED)
+DOCS_TARGET_REQUIRE_DIR([$SPECIFIED_SOURCEDIR $SPECIFIED_SOURCEDIR/source ..], [param/loadparm.c], SAMBASOURCEDIR, UNDOCUMENTED)
 
 AC_MSG_RESULT([])
 AC_MSG_RESULT([Summary:])
diff --git a/docs/scripts/find_missing_doc.pl b/docs/scripts/find_missing_doc.pl
index 545bf140ae..2b557b974d 100755
--- a/docs/scripts/find_missing_doc.pl
+++ b/docs/scripts/find_missing_doc.pl
@@ -27,7 +27,7 @@ chdir($curdir);
 # Reading entries from source code
 
 
-open(SOURCE,"$topdir/source/param/loadparm.c") or die("Can't open $topdir/source/param/loadparm.c: $!");
+open(SOURCE,"$topdir/param/loadparm.c") or die("Can't open $topdir/param/loadparm.c: $!");
 
 while ($ln = <SOURCE>) {
   last if $ln =~ m/^static\ struct\ parm_struct\ parm_table.*/;
@@ -42,7 +42,7 @@ while ($ln = <SOURCE>) {
   if($doc{lc($1)}) {
 	$doc{lc($1)} = "FOUND";
   } else {
-	print "$1 is not documented!\n";
+	print "'$1' is not documented\n";
   }
 }
 close SOURCE;
@@ -52,6 +52,6 @@ close SOURCE;
 
 foreach (keys %doc) {
 	if($doc{$_} cmp "FOUND") {
-		print "$_ is documented but is not a configuration option!\n";
+		print "'$_' is documented but is not a configuration option\n";
 	}
 }
diff --git a/docs/scripts/find_missing_manpages.pl b/docs/scripts/find_missing_manpages.pl
index b346bf07d3..c468d7d1ee 100755
--- a/docs/scripts/find_missing_manpages.pl
+++ b/docs/scripts/find_missing_manpages.pl
@@ -8,7 +8,7 @@ $topdir = (shift @ARGV) or $topdir = ".";
 
 $progs = "";
 
-open(IN, "$topdir/source/Makefile.in");
+open(IN, "$topdir/Makefile.in");
 while(<IN>) {
 	if($invar && /^([ \t]*)(.*?)([\\])$/) {
 		$progs.=" " . $2;
@@ -34,6 +34,6 @@ foreach(split(/bin\//, $progs)) {
 	}
 
 	if(!$found) {
-		print "$f doesn't have a manpage!\n";
+		print "'$f' does not have a manpage\n";
 	}
 }
diff --git a/docs/xslt/extract-smbfiles.xsl b/docs/xslt/extract-smbfiles.xsl
index 1533980145..88ca50ec33 100644
--- a/docs/xslt/extract-smbfiles.xsl
+++ b/docs/xslt/extract-smbfiles.xsl
@@ -21,7 +21,7 @@
 		<xsl:apply-templates/>
 	</xsl:variable>
 	<!-- Now put varlistentry into separate file _if_ it has anchor associated with it -->
-	<xsl:variable name="filename"><xsl:text>examples/</xsl:text><xsl:value-of select="@name"/></xsl:variable>
+	<xsl:variable name="filename"><xsl:text>output/examples/</xsl:text><xsl:value-of select="@name"/></xsl:variable>
 	<!-- Debug message for an operator, just to show progress of processing :) -->
 	<xsl:message>
 		<xsl:text>Writing </xsl:text>