[geany/geany] 8ee8d8: Unconditionally install HTML manual (oops)

[Matthew Brush]

Branch:      refs/heads/master
Author:      Matthew Brush <matt at geany.org>
Committer:   Matthew Brush <matt at geany.org>
Date:        Mon, 28 Apr 2014 02:15:48 UTC
Commit:      8ee8d8c4f134e8cea167759b60890147197a4c8c
             https://github.com/geany/geany/commit/8ee8d8c4f134e8cea167759b60890147197a4c8c

Log Message:
-----------
Unconditionally install HTML manual (oops)


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

Modified: doc/Makefile.am
11 lines changed, 3 insertions(+), 8 deletions(-)
===================================================================
@@ -58,10 +58,6 @@ hacking.html: $(srcdir)/geany.css $(top_srcdir)/HACKING
 
 all-html-local: geany.html hacking.html
 
-install-html-local:
-	$(mkinstalldirs) $(DOCDIR)/html
-	$(INSTALL_DATA) $(srcdir)/geany.html $(DOCDIR)/html/index.html
-
 clean-html-local:
 	-rm -f hacking.html
 # FIXME: why is the generated HTML manual checked-in to VCS?
@@ -69,7 +65,6 @@ clean-html-local:
 
 else
 all-html-local:;
-install-html-local:;
 clean-html-local:;
 endif
 
@@ -134,8 +129,8 @@ uninstall-local:
 	rm -rf $(DOCDIR);
 
 # manually install some files under another name
-install-data-local: install-html-local
-	$(mkinstalldirs) $(DOCDIR)
+install-data-local:
+	$(mkinstalldirs) $(DOCDIR)/html
+	$(INSTALL_DATA) $(srcdir)/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).