From: Ian Lynagh Date: Wed, 12 Sep 2007 11:39:54 +0000 (+0000) Subject: Fix installation code X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=commitdiff_plain;h=8c1cd305ba160cb6f515ee432e762fa82739b57b Fix installation code --- diff --git a/libraries/Makefile b/libraries/Makefile index 061b988..a938746 100644 --- a/libraries/Makefile +++ b/libraries/Makefile @@ -316,13 +316,13 @@ 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_SCRIPT) gen_contents_index $(DESTDIR)$(htmldir_install) + $(INSTALL_DIR) $(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) - $(INSTALL_DATA) $(DESTDIR)$(htmldir_install)/base/*.js $(DESTDIR)$(htmldir_install) - $(INSTALL_DATA) $(DESTDIR)$(htmldir_install)/base/*.gif $(DESTDIR)$(htmldir_install) + $(INSTALL_DATA) $(DESTDIR)$(htmldir_install)/base-*/*.css $(DESTDIR)$(htmldir_install) + $(INSTALL_DATA) $(DESTDIR)$(htmldir_install)/base-*/*.js $(DESTDIR)$(htmldir_install) + $(INSTALL_DATA) $(DESTDIR)$(htmldir_install)/base-*/*.gif $(DESTDIR)$(htmldir_install) endif # Cabal doesn't let us ask to install docs only, so do nothing here