Skip to content

Commit

Permalink
Fix building documentation in build directory.
Browse files Browse the repository at this point in the history
Thanks Michael Tokarev
  • Loading branch information
wtoorop committed Sep 5, 2022
1 parent 173fbf3 commit 5d5c95a
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 13 deletions.
4 changes: 4 additions & 0 deletions Changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
1.8.4 2022-??-??
* Fix building documentation in build directory.
Thanks Michael Tokarev

1.8.3 2022-08-15
* bugfix #183: Assertion failure with OPT record without rdata.
This caused packet creation with only a DO bit (for DNSSEC OK)
Expand Down
2 changes: 1 addition & 1 deletion Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@ doxygen:
@if test ! -e doc/header.html ; then \
$(INSTALL) -c -m 644 $(srcdir)/doc/header.html doc/ ; \
fi ;
$(doxygen) $(srcdir)/libdns.doxygen
$(doxygen) libdns.doxygen

doc: manpages $(doxygen)
@$(INSTALL) -d doc
Expand Down
3 changes: 1 addition & 2 deletions ldns/net.h.in
Original file line number Diff line number Diff line change
Expand Up @@ -91,13 +91,12 @@ int ldns_tcp_bgsend(ldns_buffer *qbin, const struct sockaddr_storage *to, sockle

/**
* Sends a buffer to an ip using tcp and return the response as a ldns_pkt
* \param[in] qbin the ldns_buffer to be send
* \param[out] result packet with the answer
* \param[in] qbin the ldns_buffer to be send
* \param[in] to the ip addr to send to
* \param[in] tolen length of the ip addr
* \param[in] timeout the timeout value for the network
* \param[out] answersize size of the packet
* \param[out] result packet with the answer
* \return status
*/
ldns_status ldns_tcp_send(uint8_t **result, ldns_buffer *qbin, const struct sockaddr_storage *to, socklen_t tolen, struct timeval timeout, size_t *answersize);
Expand Down
20 changes: 10 additions & 10 deletions libdns.doxygen.in
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ PROJECT_BRIEF =
# pixels and the maximum width should not exceed 200 pixels. Doxygen will copy
# the logo to the output directory.

PROJECT_LOGO = doc/images/LogoInGradientBar2-y100.png
PROJECT_LOGO = @srcdir@/doc/images/LogoInGradientBar2-y100.png

# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path
# into which the generated documentation will be written. If a relative path is
Expand Down Expand Up @@ -854,12 +854,12 @@ WARN_LOGFILE =
# spaces. See also FILE_PATTERNS and EXTENSION_MAPPING
# Note: If this tag is empty the current directory is searched.

INPUT = . \
ldns/ \
doc/ \
examples/ldns-mx.c \
examples/ldns-read-zone.c \
examples/ldns-signzone.c
INPUT = ldns/ \
@srcdir@/doc/ \
@srcdir@/examples/ldns-mx.c \
@srcdir@/examples/ldns-read-zone.c \
@srcdir@/examples/ldns-signzone.c \
@srcdir@

# 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
Expand Down Expand Up @@ -936,7 +936,7 @@ EXCLUDE_SYMBOLS =
# that contain example code fragments that are included (see the \include
# command).

EXAMPLE_PATH = examples
EXAMPLE_PATH = @srcdir@/examples

# If the value of the EXAMPLE_PATH tag contains directories, you can use the
# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp and
Expand All @@ -956,7 +956,7 @@ EXAMPLE_RECURSIVE = NO
# that contain images that are to be included in the documentation (see the
# \image command).

IMAGE_PATH = doc/images
IMAGE_PATH = @srcdir@/doc/images

# The INPUT_FILTER tag can be used to specify a program that doxygen should
# invoke to filter for each input file. Doxygen will invoke the filter program
Expand Down Expand Up @@ -1798,7 +1798,7 @@ COMPACT_LATEX = NO
# The default value is: a4.
# This tag requires that the tag GENERATE_LATEX is set to YES.

PAPER_TYPE = a4wide
PAPER_TYPE = a4

# The EXTRA_PACKAGES tag can be used to specify one or more LaTeX package names
# that should be included in the LaTeX output. The package can be specified just
Expand Down

0 comments on commit 5d5c95a

Please sign in to comment.