-include $(TOP)/mk/paths.mk
-include $(TOP)/mk/opts.mk
-include $(TOP)/mk/version.mk
-include $(TOP)/mk/suffix.mk
+-include $(TOP)/mk/suffix.mk
# -----------------------------------------------------------------
# Override $(libdir) and $(datadir), so GHC stuff gets installed
# into a suitable subdirectory of $(libdir).
-libdir := $(libdir)/$(ProjectNameShort)-$(ProjectVersion)
-datadir := $(datadir)/$(ProjectNameShort)-$(ProjectVersion)
+libdir := $(libdir)/$(ProjectNameShort)-$(ProjectVersion)
+libexecdir := $(libdir)/bin
+datadir := $(datadir)/$(ProjectNameShort)-$(ProjectVersion)