Commit bd2a36fc authored by Ian Lynagh's avatar Ian Lynagh
Browse files

Handle doc-index*.html, not just doc-index.html

haddock sometimes makes doc-index-A.html etc files. Not sure why it
doesn't for me.
Patch from Judah Jacobson.
parent 8c1cd305
...@@ -300,7 +300,7 @@ clean: $(foreach SUBDIR,$(SUBDIRS),clean.library.$(SUBDIR)) ...@@ -300,7 +300,7 @@ clean: $(foreach SUBDIR,$(SUBDIRS),clean.library.$(SUBDIR))
$(RM) -rf bootstrapping.* $(RM) -rf bootstrapping.*
$(RM) -rf ifBuildable $(RM) -rf ifBuildable
$(RM) -rf installPackage $(RM) -rf installPackage
$(RM) -f libraries.txt index.html doc-index.html doc-index-*.html $(RM) -f libraries.txt index.html doc-index.html doc-index*.html
$(foreach SUBDIR,$(SUBDIRS),clean.library.$(SUBDIR)): \ $(foreach SUBDIR,$(SUBDIRS),clean.library.$(SUBDIR)): \
clean.library.%: clean.library.%:
...@@ -317,7 +317,7 @@ endif ...@@ -317,7 +317,7 @@ endif
install: $(foreach SUBDIR,$(SUBDIRS),install.library.$(SUBDIR)) install: $(foreach SUBDIR,$(SUBDIRS),install.library.$(SUBDIR))
ifeq "$(HADDOCK_DOCS)" "YES" ifeq "$(HADDOCK_DOCS)" "YES"
$(INSTALL_DIR) $(DESTDIR)$(htmldir_install) $(INSTALL_DIR) $(DESTDIR)$(htmldir_install)
$(INSTALL_DATA) index.html doc-index.html $(DESTDIR)$(htmldir_install) $(INSTALL_DATA) index.html doc-index*.html $(DESTDIR)$(htmldir_install)
$(INSTALL_SCRIPT) gen_contents_index $(DESTDIR)$(htmldir_install) $(INSTALL_SCRIPT) gen_contents_index $(DESTDIR)$(htmldir_install)
# Hacks: # Hacks:
$(INSTALL_DATA) $(DESTDIR)$(htmldir_install)/base-*/*.css $(DESTDIR)$(htmldir_install) $(INSTALL_DATA) $(DESTDIR)$(htmldir_install)/base-*/*.css $(DESTDIR)$(htmldir_install)
...@@ -356,7 +356,7 @@ binary-dist: $(foreach SUBDIR,$(SUBDIRS),binary-dist.library.$(SUBDIR)) ...@@ -356,7 +356,7 @@ binary-dist: $(foreach SUBDIR,$(SUBDIRS),binary-dist.library.$(SUBDIR))
ifeq "$(HADDOCK_DOCS)" "YES" ifeq "$(HADDOCK_DOCS)" "YES"
cp gen_contents_index $(BIN_DIST_LIBDIR) cp gen_contents_index $(BIN_DIST_LIBDIR)
cp index.html $(BIN_DIST_LIBDIR) cp index.html $(BIN_DIST_LIBDIR)
cp doc-index.html $(BIN_DIST_LIBDIR) cp doc-index*.html $(BIN_DIST_LIBDIR)
endif endif
cp -pR stamp $(BIN_DIST_LIBDIR) cp -pR stamp $(BIN_DIST_LIBDIR)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment