@@ -152,7 +152,7 @@ haddock: build-lib-doc
152cleanup_files+=html
152cleanup_files+=html
153html/: configure
153html/: configure
154 -rm -rf html
154 -rm -rf html
155− $(BUILDCMD) haddock && mv $(BUILDDIR)/doc/html .
155+ $(BUILDCMD) haddock && cp -r $(BUILDDIR)/doc/html .
157.PHONY: build-all
157.PHONY: build-all
158build-all: build-program build-lib-doc
158build-all: build-program build-lib-doc
@@ -203,9 +203,9 @@ uninstall-exec:
203install-program: install-exec install-doc
203install-program: install-exec install-doc
204uninstall-program: uninstall-exec uninstall-doc
204uninstall-program: uninstall-exec uninstall-doc
206−# Install everything.
207.PHONY: install-all uninstall-all
206.PHONY: install-all uninstall-all
208−install-all: build-exec install-doc install-lib-doc
208+install-all: build-all install-doc install-lib-doc
209 # Install the library (+ main executable) and register it.
209 # Install the library (+ main executable) and register it.
210 destdir=$(DESTDIR); \
210 destdir=$(DESTDIR); \
211 # Older Cabal versions have no '--destdir' option.
211 # Older Cabal versions have no '--destdir' option.
@@ -219,7 +219,7 @@ install-all: build-exec install-doc install-lib-doc
219 # Note that, we are in the position of having to install the wrappers
219 # Note that, we are in the position of having to install the wrappers
220 # separately, as Cabal installs the main exec along with the library.
220 # separately, as Cabal installs the main exec along with the library.
221 $(call install-executable-files,$(WRAPPERS),$(BINPATH))
221 $(call install-executable-files,$(WRAPPERS),$(BINPATH))
222−uninstall-all: uninstall-exec uninstall-doc uninstall-lib-doc
222+uninstall-all: uninstall-program uninstall-lib-doc
223 -pkg_id="$(NAME)-$(VERSION)"; \
223 -pkg_id="$(NAME)-$(VERSION)"; \
224 libdir=$$($(GHC_PKG) field $$pkg_id library-dirs 2>/dev/null | \
224 libdir=$$($(GHC_PKG) field $$pkg_id library-dirs 2>/dev/null | \
225 sed 's/^library-dirs: *//'); \
225 sed 's/^library-dirs: *//'); \