History

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.

Anton Khirnov committed 5 years ago

Commit 5384ee41 parent a501d552 files · +7 −4Browse files

Unified · Split

2 files
  1. doc/Makefile +1 −1
  2. doc/doxy-wrapper.sh +6 −3
doc/Makefile+1−1
@@ -102,7 +102,7 @@ DOXY_INPUT_DEPS = $(addprefix $(SRC_PATH)/, $(DOXY_INPUT)) ffbuild/config.mak · 101 unmodified lines
102102
103103 doc/doxy/html: TAG = DOXY
104104 doc/doxy/html: $(SRC_PATH)/doc/Doxyfile $(SRC_PATH)/doc/doxy-wrapper.sh $(DOXY_INPUT_DEPS)
105− $(M)OUT_DIR=$$PWD/doc/doxy; cd $(SRC_PATH); ./doc/doxy-wrapper.sh $$OUT_DIR $< $(DOXYGEN) $(DOXY_INPUT);
105+ $(M)$(SRC_PATH)/doc/doxy-wrapper.sh $$PWD/doc/doxy $(SRC_PATH) doc/Doxyfile $(DOXYGEN) $(DOXY_INPUT);
106106
107107 install-doc: install-html install-man
108108
doc/doxy-wrapper.sh+6−3
@@ -1,10 +1,13 @@
11 #!/bin/sh
22
33 OUT_DIR="${1}"
4−DOXYFILE="${2}"
5−DOXYGEN="${3}"
4+SRC_DIR="${2}"
5+DOXYFILE="${3}"
6+DOXYGEN="${4}"
67
7−shift 3
8+shift 4
9+
10+cd ${SRC_DIR}
811
912 if [ -e "VERSION" ]; then
1013 VERSION=`cat "VERSION"`

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t