nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-12 22:23:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

doxygen: Use @SRCDIR@ instead of @top_srcdir@.

Browse Source 
Our @top_srcdir@ directory can contain "..", which confuses doxygen
when it tries to make references to directories.  Using
@abs_top_srcdir@ has the same problem.  Instead, we should use our
@SRCDIR@ configuration variable, which is canonicalized.
This commit is contained in:
Nick Mathewson 2019-11-05 08:37:22 -05:00
parent 6e023d5585
commit 4c2c98900b
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Doxyfile.in
View File

@ -256,7 +256,7 @@ TAB_SIZE = 8
ALIASES = ALIASES =
ALIASES += refdir{1}="\ref @top_srcdir@/src/\1 \"\1\"" ALIASES += refdir{1}="\ref @SRCDIR@/src/\1 \"\1\""
# This tag can be used to specify a number of word-keyword mappings (TCL only). # This tag can be used to specify a number of word-keyword mappings (TCL only).
# A mapping has the form "name=value". For example adding "class=itcl::class" # A mapping has the form "name=value". For example adding "class=itcl::class"
@ -818,7 +818,7 @@ WARN_LOGFILE =
# spaces. See also FILE_PATTERNS and EXTENSION_MAPPING # spaces. See also FILE_PATTERNS and EXTENSION_MAPPING
# Note: If this tag is empty the current directory is searched. # Note: If this tag is empty the current directory is searched.
INPUT = @top_srcdir@/src/ INPUT = @SRCDIR@/src/
# This tag can be used to specify the character encoding of the source files # This tag can be used to specify the character encoding of the source files
# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
@ -860,9 +860,9 @@ RECURSIVE = YES
# Note that relative paths are relative to the directory from which doxygen is # Note that relative paths are relative to the directory from which doxygen is
# run. # run.
EXCLUDE = @top_srcdir@/src/ext \ EXCLUDE = @SRCDIR@/src/ext \
@top_srcdir@/src/trunnel \ @SRCDIR@/src/trunnel \
@top_srcdir@/src/test @SRCDIR@/src/test
# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or # The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
# directories that are symbolic links (a Unix file system feature) are excluded # directories that are symbolic links (a Unix file system feature) are excluded

1
configure.ac
View File

@ -2129,6 +2129,7 @@ if test "x$SRCDIR" = "x"; then
SRCDIR=$(cd "$srcdir"; pwd) SRCDIR=$(cd "$srcdir"; pwd)
fi fi
AH_TEMPLATE([SRCDIR],[tor's sourcedir directory]) AH_TEMPLATE([SRCDIR],[tor's sourcedir directory])
AC_SUBST(SRCDIR)
AC_DEFINE_UNQUOTED(SRCDIR,"$SRCDIR") AC_DEFINE_UNQUOTED(SRCDIR,"$SRCDIR")
if test "x$CONFDIR" = "x"; then if test "x$CONFDIR" = "x"; then