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
102 102
103doc/doxy/html: TAG = DOXY103doc/doxy/html: TAG = DOXY
104doc/doxy/html: $(SRC_PATH)/doc/Doxyfile $(SRC_PATH)/doc/doxy-wrapper.sh $(DOXY_INPUT_DEPS)104doc/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);
106 106
107install-doc: install-html install-man107install-doc: install-html install-man
108 108
doc/doxy-wrapper.sh+6−3
@@ -1,10 +1,13 @@
1#!/bin/sh1#!/bin/sh
2 2
3OUT_DIR="${1}"3OUT_DIR="${1}"
4DOXYFILE="${2}"4SRC_DIR="${2}"
5DOXYGEN="${3}"5DOXYFILE="${3}"
6DOXYGEN="${4}"
6 7
7shift 38shift 4
9
10cd ${SRC_DIR}
8 11
9if [ -e "VERSION" ]; then12if [ -e "VERSION" ]; then
10 VERSION=`cat "VERSION"`13 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