diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2009-05-01 04:40:55 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2009-05-01 13:10:13 +0200 |
| commit | 4abc5c945e305df24476f2cc93b63353c3dd922e (patch) | |
| tree | f45eb730ee080cf3cab2db1f6d4e6e497f99c9c5 | |
| parent | 6e48495ee715156a292d96d9fa87ec7ff17d02f6 (diff) | |
| download | samba-4abc5c945e305df24476f2cc93b63353c3dd922e.tar.gz samba-4abc5c945e305df24476f2cc93b63353c3dd922e.tar.bz2 samba-4abc5c945e305df24476f2cc93b63353c3dd922e.zip | |
Fix 'make undocumented' (by hardcoding the source path, now that the docs
live in the same git repo)
| -rw-r--r-- | docs-xml/Makefile.settings.in | 2 | ||||
| -rw-r--r-- | docs-xml/aclocal.m4 | 26 | ||||
| -rw-r--r-- | docs-xml/configure.ac | 6 | ||||
| -rwxr-xr-x | docs-xml/scripts/find_missing_manpages.pl | 2 |
4 files changed, 2 insertions, 34 deletions
diff --git a/docs-xml/Makefile.settings.in b/docs-xml/Makefile.settings.in index 92a00974ff..254ac6be00 100644 --- 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 9ecbda5e6b..1252d2113f 100644 --- 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 c0d6686742..02e5c5d78b 100644 --- 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 39bf7983ff..90d9f6abe8 100755 --- 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) { |