mirror of
https://github.com/samba-team/samba.git
synced 2024-12-22 13:34:15 +03:00
Allow specifying a directory with the samba sources
(This used to be commit 411a84c102
)
This commit is contained in:
parent
a1a6c5198a
commit
e16f34e943
@ -33,7 +33,7 @@ endif
|
||||
TOPDIR = $(shell pwd)
|
||||
OUTPUTDIR = $(TOPDIR)/output
|
||||
ARCHIVEDIR = $(OUTPUTDIR)/archive
|
||||
SRCDIR = @srcdir@
|
||||
SRCDIR = @SAMBASOURCEDIR@
|
||||
MANDIR = $(OUTPUTDIR)/manpages
|
||||
EPSTOPDF = @EPSTOPDF@
|
||||
MANPAGEDIR = $(TOPDIR)/manpages
|
||||
@ -270,7 +270,7 @@ $(MANDIR)/%: %.xml
|
||||
# Find undocumented parameters
|
||||
|
||||
undocumented: $(SMBDOTCONFDOC)/parameters.all.xml
|
||||
$(PERL) scripts/find_missing_doc.pl ../..
|
||||
@$(PERL) scripts/find_missing_doc.pl $(SRCDIR)
|
||||
|
||||
# Examples and the like
|
||||
|
||||
|
22
docs/aclocal.m4
vendored
22
docs/aclocal.m4
vendored
@ -33,3 +33,25 @@ 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_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
|
||||
fi
|
||||
])
|
||||
|
@ -5,20 +5,24 @@ DUPLICATE_ULINKS=""
|
||||
|
||||
DOCROP="0"
|
||||
|
||||
AC_ARG_WITH(samba-sources,
|
||||
[ --with-samba-sources=DIR Specify path to Samba sources],
|
||||
[ test "$withval" && SPECIFIED_SOURCEDIR="$withval" ])
|
||||
|
||||
AC_ARG_ENABLE(crop,
|
||||
[ --enable-crop Whether to use a crop template],
|
||||
[ --enable-crop Whether to use a crop template],
|
||||
[ test "$withval" && DOCROP="1" ])
|
||||
|
||||
PAPERSIZE="a4paper"
|
||||
|
||||
AC_ARG_WITH(papersize,
|
||||
[ --with-papersize Specify papersize (a4paper,letter) ],
|
||||
[ --with-papersize Specify papersize (a4paper,letter) ],
|
||||
[ test "$withval" && PAPERSIZE="$withval" ])
|
||||
|
||||
FONTSIZE="10.5"
|
||||
|
||||
AC_ARG_WITH(fontsize,
|
||||
[ --with-fontsize Specify the fontsize in points (default: 10.5) ],
|
||||
[ --with-fontsize Specify the fontsize in points (default: 10.5) ],
|
||||
[ test "$withval" && FONTSIZE="$withval" ])
|
||||
|
||||
|
||||
@ -28,6 +32,7 @@ AC_SUBST(PAPERSIZE)
|
||||
AC_SUBST(DUPLICATE_ULINKS)
|
||||
AC_SUBST(FONTSIZE)
|
||||
AC_SUBST(DOCROP)
|
||||
AC_SUBST(SAMBASOURCEDIR)
|
||||
|
||||
DOCS_TARGET_REQUIRE_PROGRAM(XSLTPROC, xsltproc, ALL)
|
||||
DOCS_TARGET_REQUIRE_PROGRAM(RM, rm, ALL)
|
||||
@ -42,12 +47,12 @@ DOCS_TARGET_REQUIRE_PROGRAM(DVIPS, dvips, PS)
|
||||
DOCS_TARGET_REQUIRE_PROGRAM(PLUCKERBUILD, plucker-build, PLUCKER)
|
||||
DOCS_TARGET_REQUIRE_PROGRAM(HTML2TEXT, html2text, TXT)
|
||||
DOCS_TARGET_REQUIRE_PROGRAM(PERL, perl, UNDOCUMENTED)
|
||||
DOCS_TARGET_REQUIRE_DIR([$SPECIFIED_SOURCEDIR ..], [source/configure.in], SAMBASOURCEDIR, UNDOCUMENTED)
|
||||
|
||||
AC_MSG_RESULT([])
|
||||
AC_MSG_RESULT([Summary:])
|
||||
AC_MSG_RESULT([--------------])
|
||||
|
||||
|
||||
DOCS_DEFINE_TARGET(ALL, [], [base requirements], [])
|
||||
DOCS_DEFINE_TARGET(LATEX, ALL, [LaTeX versions], [tex])
|
||||
DOCS_DEFINE_TARGET(PDF, LATEX, [PDF versions], [pdf])
|
||||
|
@ -9,7 +9,7 @@ $topdir = (shift @ARGV) or $topdir = ".";
|
||||
|
||||
$curdir = $ENV{PWD};
|
||||
|
||||
chdir($topdir."/docs/docbook/smbdotconf");
|
||||
chdir("smbdotconf");
|
||||
|
||||
open(IN,"xsltproc --xinclude --param smb.context ALL generate-context.xsl parameters.all.xml|");
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user