[PATCH] Make sure the user-manual.html output always ends up in $(OUT)
Thiago Macieira
thiago at macieira.org
Mon Feb 24 16:36:23 UTC 2014
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 at macieira.org>
---
Documentation/Makefile | 2 +-
subsurface.pro | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Documentation/Makefile b/Documentation/Makefile
index c3ae22e..204aeb8 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 2c78751..7ba8e51 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
--
1.8.4.5
More information about the subsurface
mailing list