From bd2a36fc0a209c119e9451376b18e3c9b199d4f5 Mon Sep 17 00:00:00 2001 From: Ian Lynagh Date: Wed, 12 Sep 2007 13:54:07 +0000 Subject: [PATCH] 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. --- libraries/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libraries/Makefile b/libraries/Makefile index a938746..e67466a 100644 --- a/libraries/Makefile +++ b/libraries/Makefile @@ -300,7 +300,7 @@ clean: $(foreach SUBDIR,$(SUBDIRS),clean.library.$(SUBDIR)) $(RM) -rf bootstrapping.* $(RM) -rf ifBuildable $(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)): \ clean.library.%: @@ -317,7 +317,7 @@ endif install: $(foreach SUBDIR,$(SUBDIRS),install.library.$(SUBDIR)) ifeq "$(HADDOCK_DOCS)" "YES" $(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) # Hacks: $(INSTALL_DATA) $(DESTDIR)$(htmldir_install)/base-*/*.css $(DESTDIR)$(htmldir_install) @@ -356,7 +356,7 @@ binary-dist: $(foreach SUBDIR,$(SUBDIRS),binary-dist.library.$(SUBDIR)) ifeq "$(HADDOCK_DOCS)" "YES" cp gen_contents_index $(BIN_DIST_LIBDIR) cp index.html $(BIN_DIST_LIBDIR) - cp doc-index.html $(BIN_DIST_LIBDIR) + cp doc-index*.html $(BIN_DIST_LIBDIR) endif cp -pR stamp $(BIN_DIST_LIBDIR) -- 1.7.10.4