--- a/skalibs-2.0.0.0/configure	2014-12-24 23:28:40.260102567 +0100
+++ b/skalibs-2.0.0.0/configure	2014-12-24 23:39:26.904111414 +0100
@@ -17,17 +17,15 @@
   --prefix=PREFIX               main installation prefix [/]
 
 Fine tuning of the installation directories:
-  --dynlibdir=DIR               shared library files [PREFIX/lib]
   --libdir=DIR                  static library files [PREFIX/usr/lib/skalibs]
   --includedir=DIR              include files for the C compiler [PREFIX/usr/include]
-  --datadir=DIR                 global configuration files [PREFIX/etc]
+  --sysconfdir=DIR              global configuration files [PREFIX/etc]
   --sysdepdir=DIR               sysdeps directory [PREFIX/usr/lib/skalibs/sysdeps]
 
 Dependencies:
   --with-sysdeps=DIR            use provided sysdeps in DIR [autodetected]
   --with-include=DIR            add DIR to the list of searched directories for headers
   --with-lib=DIR                add DIR to the list of searched directories for static libraries
-  --with-dynlib=DIR             add DIR to the list of searched directories for shared libraries
 
 Optional features:
   --disable-shared              do not build shared libraries [enabled]
@@ -169,15 +167,14 @@
 
 CC_AUTO="$CC"
 CFLAGS_AUTO="$CFLAGS"
-CPPFLAGS_AUTO="-D_POSIX_C_SOURCE=200809L -D_XOPEN_SOURCE=700 -O2 $CPPFLAGS"
+CPPFLAGS_AUTO="-D_POSIX_C_SOURCE=200809L -D_XOPEN_SOURCE=700 $CPPFLAGS"
 LDFLAGS_AUTO="$LDFLAGS"
 LDFLAGS_NOSHARED=
 prefix=
-dynlibdir='$prefix/lib'
-libdir='$prefix/usr/lib/skalibs'
-includedir='$prefix/usr/include'
-datadir='$prefix/etc'
-sysdepdir='$prefix/usr/lib/$package/sysdeps'
+libdir='$prefix/lib'
+includedir='$prefix/include'
+sysconfdir='/etc'
+sysdepdir='$libdir/$package/sysdeps'
 sysdeps=
 shared=true
 static=true
@@ -208,15 +205,13 @@
   case "$arg" in
     --help) usage ;;
     --prefix=*) prefix=${arg#*=} ;;
-    --dynlibdir=*) dynlibdir=${arg#*=} ;;
     --libdir=*) libdir=${arg#*=} ;;
     --includedir=*) includedir=${arg#*=} ;;
-    --datadir=*) datadir=${arg#*=} ;;
+    --sysconfdir=*) sysconfdir=${arg#*=} ;;
     --sysdepdir=*) sysdepdir=${arg#*=} ;;
     --with-sysdeps=*) sysdeps=${arg#*=} ;;
     --with-include=*) var=${arg#*=} ; stripdir var ; addincpath="$addincpath -I$var" ;;
     --with-lib=*) var=${arg#*=} ; stripdir var ; addlibspath="$addlibspath -L$var" ; vpaths="$vpaths $var" ;;
-    --with-dynlib=*) var=${arg#*=} ; stripdir var ; addlibdpath="$addlibdpath -L$var" ; vpathd="$vpathd $var" ;;
     --enable-shared|--enable-shared=yes) shared=true ;;
     --disable-shared|--enable-shared=no) shared=false ;;
     --enable-static|--enable-static=yes) static=true ;;
@@ -255,7 +250,7 @@
   esac
 done
 
-for i in prefix exec_prefix dynlibdir libdir includedir datadir sysdepdir sysdeps sproot ; do
+for i in prefix exec_prefix libdir includedir sysconfdir sysdepdir sysdeps sproot ; do
   eval tmp=\${$i}
   eval $i=$tmp
   stripdir $i
@@ -282,7 +277,6 @@
   sysdepdir=${home}/sysdeps
   binprefix=${home}/command
   extbinprefix=${exthome}/command
-  dynlibdir=${home}/library.so
   libdir=${home}/library
   includedir=${home}/include
 fi
@@ -491,9 +485,8 @@
 target := $target
 package := $package
 prefix := $prefix
-datadir := $datadir
+sysconfdir := $sysconfdir
 sysdepdir := $sysdepdir
-dynlibdir := $dynlibdir
 libdir := $libdir
 includedir := $includedir
 sysdeps := $sysdeps
@@ -548,7 +541,7 @@
 
 #define ${package_macro_name}_VERSION "$version"
 #define ${package_macro_name}_DEFAULTPATH "$defaultpath"
-#define ${package_macro_name}_ETC "$datadir"
+#define ${package_macro_name}_ETC "$sysconfdir"
 #define ${package_macro_name}_SPROOT "$sproot"
 #define ${package_macro_name}_HOME "$home"
 EOF