@@ -46,6 +46,8 @@ destdir :=
4646# Fallback to defaults but allow to get the values from environment.
4747PREFIX ?= $(prefix)
4848DESTDIR ?= $(destdir)
49+DATADIR ?= $(PKGID)
50+DOCDIR ?= $(PKGID)/doc
4951
5052#-------------------------------------------------------------------------------
5153# Installation paths
@@ -54,8 +56,8 @@ DESTPATH := $(DESTDIR)$(PREFIX)
5456BINPATH := $(DESTPATH)/bin
5557DATAPATH := $(DESTPATH)/share
5658MANPATH := $(DATAPATH)/man
57−PKGDATAPATH := $(DATAPATH)/$(PKGID)
58−PKGDOCPATH := $(PKGDATAPATH)/doc
59+PKGDATAPATH := $(DATAPATH)/$(DATADIR)
60+PKGDOCPATH := $(DATAPATH)/$(DOCDIR)
5961
6062#-------------------------------------------------------------------------------
6163# Generic Makefile variables
@@ -190,7 +192,7 @@ uninstall-program: uninstall-exec uninstall-doc
190192
191193.PHONY: install-all uninstall-all
192194# Full installation through Cabal: main + wrappers + user docs + lib + lib docs
193−install-all: install-program
195+install-all: build-all install-program
194196 destdir=$(DESTDIR); \
195197 # Older Cabal versions have no '--destdir' option.
196198 if $(BUILDCMD) copy --help | grep -q '\-\-destdir'; then \