Index: b/GNUmakefile
===================================================================
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -173,7 +173,7 @@ else
   PC_PREFIX = $(PREFIX)
 endif
 ifeq ($(LIBDIR),)
-  LIBDIR := $(PREFIX)/lib
+  LIBDIR := $(PREFIX)/$(LIB)
   PC_LIBDIR = $${prefix}/lib
 else
   PC_LIBDIR = $(LIBDIR)
@@ -1128,7 +1128,7 @@ SOLIB_COMPAT_SUFFIX=.$(LIB_MAJOR)
 ifneq ($(IS_LINUX)$(IS_HURD),00)
 # Linux uses full version suffix for shared library
 SOLIB_VERSION_SUFFIX=.$(LIB_MAJOR).$(LIB_MINOR).$(LIB_PATCH)
-SOLIB_FLAGS=-Wl,-soname,libcryptopp.so$(SOLIB_COMPAT_SUFFIX)
+SOLIB_FLAGS=-Wl,-soname,libcryptopp.so$(SOLIB_VERSION_SUFFIX)
 endif
 # Solaris uses -Wl,-h
 ifeq ($(IS_SUN),1)