diff options
| author |  Thiago Macieira <thiago@macieira.org> | 2014-02-24 16:36:23 -0800 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2014-02-25 15:30:38 -0800 |
| commit | 3318aefa464103f3966e773b3af9898a87c5e441 (patch) | |
| tree | de7e154890b1819b18f588a071b474a81d04d3cf | |
| parent | 67a1e3f3e0d18cd78c1e88471fbf664560f6bebb (diff) | |
| download | subsurface-3318aefa464103f3966e773b3af9898a87c5e441.tar.gz | |
Make sure the user-manual.html output always ends up in $(OUT)
If you're doing a non-local build, it would get saved in the source
dir. Then qmake would complain that it couldn't find it in the target
dir.
Signed-off-by: Thiago Macieira <thiago@macieira.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
| -rw-r--r-- | Documentation/Makefile | 2 | ||||
| -rw-r--r-- | subsurface.pro | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/Makefile b/Documentation/Makefile index c3ae22e02..204aeb8e8 100644 --- a/Documentation/Makefile +++ b/Documentation/Makefile @@ -29,7 +29,7 @@ $(OUT)$(DOCNAME).pdf: $(DOCSOURCE) $(OUT)$(HTMLDOC): $(DOCSOURCE) @echo "if asciidoc isn't found the html file included in the sources is copied" $(ASCIIDOC) -a toc -a toclevels=3 -a themedir=$(PWD) -a theme=$(THEME) -a stylesdir=$(PWD) \ - -o $(HTMLDOC) $< || cp $(HTMLDOC).git $(HTMLDOC) + -o $(OUT)$(HTMLDOC) $< || cp $(HTMLDOC).git $(OUT)$(HTMLDOC) # Alternatively:: $(OUT)$(DOCNAME).xhtml: $(DOCSOURCE) diff --git a/subsurface.pro b/subsurface.pro index 2c7875110..7ba8e51f1 100644 --- a/subsurface.pro +++ b/subsurface.pro @@ -196,7 +196,7 @@ QTTRANSLATIONS = \ qt_sk.qm \ qt_sv.qm -doc.commands += $$escape_expand(\\n\\t)$(MAKE) -C $$PWD/Documentation OUT=$$OUT_PWD/Documentation/ doc +doc.commands += $(MKDIR) $$OUT_PWD/Documentation$$escape_expand(\\n\\t)$(MAKE) -C $$PWD/Documentation OUT=$$OUT_PWD/Documentation/ doc all.depends += doc QMAKE_EXTRA_TARGETS += doc all |