[geany/geany] 712507: Fix HTML documentation installation for VPATH builds

Colomban Wendling git-noreply at xxxxx
Fri Aug 29 15:05:18 UTC 2014


Branch:      refs/heads/master
Author:      Colomban Wendling <ban at herbesfolles.org>
Committer:   Colomban Wendling <ban at herbesfolles.org>
Date:        Fri, 29 Aug 2014 15:05:18 UTC
Commit:      7125075168198f00f66001cbeaeb3d2318c0abf7
             https://github.com/geany/geany/commit/7125075168198f00f66001cbeaeb3d2318c0abf7

Log Message:
-----------
Fix HTML documentation installation for VPATH builds


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

Modified: doc/Makefile.am
5 lines changed, 4 insertions(+), 1 deletions(-)
===================================================================
@@ -113,6 +113,9 @@ uninstall-local:
 # manually install some files under another name
 install-data-local:
 	$(mkinstalldirs) $(DOCDIR)/html
-	$(INSTALL_DATA) $(srcdir)/geany.html $(DOCDIR)/html/index.html
+#	as we don't install with the automated mechanism so we can rename the file,
+#	we need to find the source file in the right location (either builddir or srcdir)
+	dir=$(builddir); test -f "$$dir/geany.html" || dir=$(srcdir); \
+	$(INSTALL_DATA) "$$dir/geany.html" $(DOCDIR)/html/index.html
 	$(INSTALL_DATA) $(srcdir)/geany.txt $(DOCDIR)/manual.txt
 	$(INSTALL_DATA) $(top_srcdir)/scintilla/License.txt $(DOCDIR)/ScintillaLicense.txt



--------------
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