diff options
| author | Anton Khirnov <anton@khirnov.net> | 2021-04-24 14:52:27 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2021-06-11 19:28:27 +0200 |
| commit | 5384ee486af11df9c9a9a9fd8f3cbd3fc859cd17 (patch) | |
| tree | 5226e3af9a4f5a9d62ac0bd2d1fc34736c4f9610 /doc | |
| parent | a501d559050f395f22153a7954b193feb18325e4 (diff) | |
| download | ffmpeg-5384ee486af11df9c9a9a9fd8f3cbd3fc859cd17.tar.gz | |
doc: fix generating doxy with out-of-tree builds
Broken in 753930bc7300dd595c4bab51c5a70d1da9083da4, as the path to
Doxyfile passed to doxy-wrapper.sh is relative to the build dir, while
the recipe cd's to the source dir before invoking the wrapper.
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/Makefile | 2 | ||||
| -rwxr-xr-x | doc/doxy-wrapper.sh | 9 |
2 files changed, 7 insertions, 4 deletions
diff --git a/doc/Makefile b/doc/Makefile index fa4996b5a3..58ca3fabd8 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -102,7 +102,7 @@ DOXY_INPUT_DEPS = $(addprefix $(SRC_PATH)/, $(DOXY_INPUT)) ffbuild/config.mak doc/doxy/html: TAG = DOXY doc/doxy/html: $(SRC_PATH)/doc/Doxyfile $(SRC_PATH)/doc/doxy-wrapper.sh $(DOXY_INPUT_DEPS) - $(M)OUT_DIR=$$PWD/doc/doxy; cd $(SRC_PATH); ./doc/doxy-wrapper.sh $$OUT_DIR $< $(DOXYGEN) $(DOXY_INPUT); + $(M)$(SRC_PATH)/doc/doxy-wrapper.sh $$PWD/doc/doxy $(SRC_PATH) doc/Doxyfile $(DOXYGEN) $(DOXY_INPUT); install-doc: install-html install-man diff --git a/doc/doxy-wrapper.sh b/doc/doxy-wrapper.sh index fe0102b5bf..729caa6347 100755 --- a/doc/doxy-wrapper.sh +++ b/doc/doxy-wrapper.sh @@ -1,10 +1,13 @@ #!/bin/sh OUT_DIR="${1}" -DOXYFILE="${2}" -DOXYGEN="${3}" +SRC_DIR="${2}" +DOXYFILE="${3}" +DOXYGEN="${4}" -shift 3 +shift 4 + +cd ${SRC_DIR} if [ -e "VERSION" ]; then VERSION=`cat "VERSION"` |