--- config.mk.org	2015-08-24 19:46:39.354151547 +0800
+++ config.mk	2015-08-24 19:49:31.040699137 +0800
@@ -12,15 +12,15 @@
 PREFIX = /usr/local#NO SPACE
 MANPREFIX = $(PREFIX)/man#NO SPACE
 BINPREFIX = $(PREFIX)/bin#NO SPACE
-LIBPREFIX = $(PREFIX)/lib#NO SPACE
+LIBPREFIX = $(PREFIX)/$(get_libdir)#NO SPACE
 
 # These paths are hardcoded into executables and libraries. Usually
 # they'll be the same as above, but package maintainers may want to
 # distinguish between the image directories and the final install
 # target.
-INSTALLED_PREFIX=$(PREFIX)
+INSTALLED_PREFIX=/usr
 INSTALLED_BINPREFIX = $(INSTALLED_PREFIX)/bin#NO SPACE
-INSTALLED_LIBPREFIX = $(INSTALLED_PREFIX)/lib#NO SPACE
+INSTALLED_LIBPREFIX = $(INSTALLED_PREFIX)/$(get_libdir)#NO SPACE
 
 # chown installed tools to this user/group
 INSTALL_CHOWN = -g root -o root
@@ -42,14 +42,14 @@
 ACCESSMODE = accessdaemon$#NO SPACE
 
 # Change to true to a build shared library instead of a static one
-SHARED_LIBRARY = true#NO SPACE
+SHARED_LIBRARY = true
 
 # Build Fortran90 module interface for marker API. Adopt Fortran compiler
 # in ./make/include_<COMPILER>.mk if necessary. Default: ifort .
 FORTRAN_INTERFACE = false#NO SPACE
 
 # Instrument likwid-bench for use with likwid-perfctr
-INSTRUMENT_BENCH = false#NO SPACE
+INSTRUMENT_BENCH = true#NO SPACE
 
 # Use Portable Hardware Locality (hwloc) instead of CPUID
 USE_HWLOC = true#NO SPACE
@@ -67,6 +67,6 @@
 RELEASE = 0
 DATE    = 28.04.2015
 
-LIBLIKWIDPIN = $(abspath $(PREFIX)/lib/liblikwidpin.so)
+LIBLIKWIDPIN = $(abspath $(PREFIX)/$(get_libdir)/liblikwidpin.so)
 LIKWIDFILTERPATH = $(abspath $(PREFIX)/share/likwid/filter)