Index: defaults.make
--- defaults.make.orig
+++ defaults.make
@@ -42,9 +42,9 @@ LIBDIR ?= $(PREFIX)/lib
 SHAREDIR ?= $(PREFIX)/share
 DATADIR ?= $(SHAREDIR)/$(PROGRAM_PREFIX)chicken$(PROGRAM_SUFFIX)
 INCLUDEDIR ?= $(PREFIX)/include
-MANDIR ?= $(SHAREDIR)/man
+MANDIR ?= $(PREFIX)/man
 
-DOCDIR ?= $(DATADIR)/doc
+DOCDIR ?= $(SHAREDIR)/doc/chicken
 VARDIR ?= $(LIBDIR)
 MAN1DIR ?= $(MANDIR)/man1
 CHICKENLIBDIR ?= $(VARDIR)/$(PROGRAM_PREFIX)chicken$(PROGRAM_SUFFIX)
@@ -191,8 +191,8 @@ ifeq ($(PLATFORM),cygwin)
 PRIMARY_LIBCHICKEN = cyg$(PROGRAM_PREFIX)chicken$(PROGRAM_SUFFIX)-0.dll
 LIBCHICKEN_SO_FILE = cyg$(PROGRAM_PREFIX)chicken$(PROGRAM_SUFFIX)-0.dll
 else
-PRIMARY_LIBCHICKEN ?= lib$(PROGRAM_PREFIX)chicken$(PROGRAM_SUFFIX)$(SO)
-LIBCHICKEN_SO_FILE ?= lib$(PROGRAM_PREFIX)chicken$(PROGRAM_SUFFIX)$(SO)
+PRIMARY_LIBCHICKEN ?= lib$(PROGRAM_PREFIX)chicken$(PROGRAM_SUFFIX)$(SO).$(LIBchicken_VERSION)
+LIBCHICKEN_SO_FILE ?= lib$(PROGRAM_PREFIX)chicken$(PROGRAM_SUFFIX)$(SO).$(LIBchicken_VERSION)
 endif
 endif
 LIBCHICKEN_SO_LIBRARIES ?= $(LIBRARIES)
@@ -281,8 +281,8 @@ DYNAMIC_CHICKEN_UNIT_IMPORT_LIBRARIES = continuation e
 # targets
 
 CHICKEN_PROGRAM = $(PROGRAM_PREFIX)chicken$(PROGRAM_SUFFIX)
-CSC_PROGRAM = $(PROGRAM_PREFIX)csc$(PROGRAM_SUFFIX)
-CSI_PROGRAM = $(PROGRAM_PREFIX)csi$(PROGRAM_SUFFIX)
+CSC_PROGRAM = $(PROGRAM_PREFIX)chicken-csc$(PROGRAM_SUFFIX)
+CSI_PROGRAM = $(PROGRAM_PREFIX)chicken-csi$(PROGRAM_SUFFIX)
 CHICKEN_PROFILE_PROGRAM = $(PROGRAM_PREFIX)chicken-profile$(PROGRAM_SUFFIX)
 CHICKEN_INSTALL_PROGRAM = $(PROGRAM_PREFIX)chicken-install$(PROGRAM_SUFFIX)
 CHICKEN_UNINSTALL_PROGRAM = $(PROGRAM_PREFIX)chicken-uninstall$(PROGRAM_SUFFIX)
