Fix 'make undocumented' (by hardcoding the source path, now that the docs

live in the same git repo)

diff --git a/docs-xml/Makefile.settings.in b/docs-xml/Makefile.settings.in
index 92a00974ff785708bb74e8d4def5219e1e4b59ac..254ac6be004b182f23c2085b2a65bbb514ef7dae 100644 (file)
--- a/docs-xml/Makefile.settings.in
+++ b/docs-xml/Makefile.settings.in
@@ -28,7 +28,7 @@ endif
 OUTPUTDIR = output
 ARCHIVEDIR = archive
 TEXINFODIR = $(OUTPUTDIR)/texi
-SRCDIR = @SAMBASOURCEDIR@
+SRCDIR = ../source3
 EPSTOPDF = @EPSTOPDF@
 MANPAGEDIR3 = manpages-3
 MAKEINDEX = @MAKEINDEX@

diff --git a/docs-xml/aclocal.m4 b/docs-xml/aclocal.m4
index 9ecbda5e6bc096818e3e0ca85fd950aece75257b..1252d2113f7ef91293211ef471b2208756ed0c04 100644 (file)
--- a/docs-xml/aclocal.m4
+++ b/docs-xml/aclocal.m4
@@ -36,29 +36,3 @@ AC_DEFUN(DOCS_TARGET_REQUIRE_PROGRAM, [
                fi
        fi
 ])
-
-dnl DOCS_TARGET_REQUIRE_DIR
-dnl arg1: list of possible paths
-dnl arg2: file in dir know to exist
-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 
-               test -f "$I/$2" && $3="$I"
-       done
-
-       if test x$$3 = x; then
-               if test x"$$4_REQUIRES" = x; then
-                       $4_REQUIRES="$3"
-               else
-                       $4_REQUIRES="$$4_REQUIRES $3"
-               fi
-               AC_MSG_RESULT([not found])
-       else
-               AC_MSG_RESULT([found in $$3])
-       fi
-])

diff --git a/docs-xml/configure.ac b/docs-xml/configure.ac
index c0d66867424b975abe02a6f0845b7c9d4541ee7b..02e5c5d78be839b1d8745eaeea012ed9f72817ce 100644 (file)
--- a/docs-xml/configure.ac
+++ b/docs-xml/configure.ac
@@ -1,9 +1,5 @@
 AC_INIT(xslt/latex.xsl)
 
-AC_ARG_WITH(samba-sources,
-[ --with-samba-sources=DIR Specify path to Samba sources],
-[ test "$withval" && SPECIFIED_SOURCEDIR="$withval" ])
-
 LATEX_DOCUMENTCLASS_OPTIONS="letterpaper,11pt,openright,twoside"
 AC_ARG_ENABLE(prentice-hall,
 [ --enable-prentice-hall     Produce Prentice-Hall compatible output],
@@ -12,7 +8,6 @@ AC_SUBST(LATEX_DOCUMENTCLASS_OPTIONS)
 
 DOC_BUILD_DATE=`date '+%d-%m-%Y'`
 AC_SUBST(DOC_BUILD_DATE)
-AC_SUBST(SAMBASOURCEDIR)
 
 DOCS_TARGET_REQUIRE_PROGRAM(XSLTPROC, xsltproc, ALL)
 DOCS_TARGET_REQUIRE_PROGRAM(RM, rm, ALL)
@@ -63,7 +58,6 @@ DOCS_TARGET_REQUIRE_PROGRAM(XMLLINT, xmllint, VALIDATE)
 DOCS_TARGET_REQUIRE_PROGRAM(FOP, fop, FOPDF)
 DOCS_TARGET_REQUIRE_PROGRAM(DB2TEXI, docbook2x-texi, TEXI)
 DOCS_TARGET_REQUIRE_PROGRAM(MAKEINFO, makeinfo, TEXIINFO)
-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-xml/scripts/find_missing_manpages.pl b/docs-xml/scripts/find_missing_manpages.pl
index 39bf7983ff58c6ef1d588e3f248e7a20bcbc4e58..90d9f6abe8cca1008dab21112346023ff6686278 100755 (executable)
--- a/docs-xml/scripts/find_missing_manpages.pl
+++ b/docs-xml/scripts/find_missing_manpages.pl
@@ -32,7 +32,7 @@ foreach(split(/bin\//, $progs)) {
        $found = 0;
 
        for($i = 0; $i < 9; $i++) {
-               if(-e "manpages/$f.$i.xml") { $found = 1; }
+               if(-e "manpages-3/$f.$i.xml") { $found = 1; }
        }
 
        if(!$found) {