Unconditionally install HTML manual (oops)

geany · Apr 28, 2014 · 8ee8d8c · 8ee8d8c
1 parent 29b5257
commit 8ee8d8c
Showing 1 changed file with 3 additions and 8 deletions.
diff --git a/doc/Makefile.am b/doc/Makefile.am
@@ -58,18 +58,13 @@ 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?
 #	-rm -f geany.html
 
 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
-