[geany/geany] e13cd0: Fix portability of make rules to build documentation

Colomban Wendling git-noreply at xxxxx
Sun Dec 22 19:47:33 UTC 2013


Branch:      refs/heads/master
Author:      Colomban Wendling <ban at herbesfolles.org>
Committer:   Colomban Wendling <ban at herbesfolles.org>
Date:        Sun, 22 Dec 2013 19:47:33 UTC
Commit:      e13cd014be208085a43cb637b67840add68b8bbb
             https://github.com/geany/geany/commit/e13cd014be208085a43cb637b67840add68b8bbb

Log Message:
-----------
Fix portability of make rules to build documentation

Support for "$<" automatic variable in non-suffix rules is a GNU Make
extension: don't use it.


Modified Paths:
--------------
    doc/Makefile.am

Modified: doc/Makefile.am
8 files changed, 4 insertions(+), 4 deletions(-)
===================================================================
@@ -8,7 +8,7 @@ EXTRA_DIST = geany.html geany.css geany.txt geany.1 \
 	$(srcdir)/$(IMAGE_FILES)
 
 geany-$(VERSION).pdf: geany.txt
-	rst2latex -stg --documentoptions="10pt,a4paper" --output-encoding=utf8 $< geany.tex
+	rst2latex -stg --documentoptions="10pt,a4paper" --output-encoding=utf8 $(srcdir)/geany.txt geany.tex
 	(absbuilddir="$$(pwd)/$(builddir)"; \
 	 cd "$(srcdir)" && \
 	 pdflatex -output-directory="$$absbuilddir" "$$absbuilddir/geany.tex")
@@ -19,13 +19,13 @@ api-doc: Doxyfile
 	doxygen
 
 hacking.html: ../HACKING
-	rst2html -stg --stylesheet=$(srcdir)/geany.css $< $@
+	rst2html -stg --stylesheet=$(srcdir)/geany.css $(srcdir)/../HACKING $@
 
 # when generating documentation, first try rst2html.py as it is the upstream default
 geany.html: geany.txt
 	(rst2html.py --version) < /dev/null > /dev/null 2>&1 && \
-	rst2html.py -stg --stylesheet=$(srcdir)/geany.css $< $@ || \
-	rst2html -stg --stylesheet=$(srcdir)/geany.css $< $@
+	rst2html.py -stg --stylesheet=$(srcdir)/geany.css $(srcdir)/geany.txt $@ || \
+	rst2html -stg --stylesheet=$(srcdir)/geany.css $(srcdir)/geany.txt $@
 
 hacking-doc: hacking.html
 doc: geany.html



--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).


More information about the Commits mailing list