6 files changed, 19 insertions, 21 deletions
diff --git a/Makefile.am b/Makefile.am
index 8fea6fa6..0c8fb693 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,7 +6,7 @@ SUBDIRS = \
 	fdisk \
 	getopt \
 	lib \
-	libs \
+	shlibs \
 	login-utils \
 	misc-utils \
 	po \
diff --git a/config/include-Makefile.am b/config/include-Makefile.am
index d5da619a..bc943301 100644
--- a/config/include-Makefile.am
+++ b/config/include-Makefile.am
@@ -16,9 +16,9 @@ dist_noinst_DATA = $(dist_man_MANS)
 
 # Paths to in-tree libraries (use ul_ prefix to avoid possible collisions)
 #
-ul_libblkid_srcdir = $(top_srcdir)/libs/blkid/src
-ul_libblkid_builddir = $(top_builddir)/libs/blkid/src
-ul_libblkid_la = $(top_builddir)/libs/blkid/src/libblkid.la
+ul_libblkid_srcdir = $(top_srcdir)/shlibs/blkid/src
+ul_libblkid_builddir = $(top_builddir)/shlibs/blkid/src
+ul_libblkid_la = $(top_builddir)/shlibs/blkid/src/libblkid.la
 
 $(ul_libblkid_la):
 	$(MAKE) -C $(ul_libblkid_builddir)
diff --git a/configure.ac b/configure.ac
index ec41ae60..1abf688f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -773,7 +773,6 @@ LIBS=""
 AC_CONFIG_HEADERS(config.h)
 
 AC_CONFIG_FILES([
-Makefile
 disk-utils/Makefile
 fdisk/Makefile
 fsck/Makefile
@@ -781,24 +780,25 @@ getopt/Makefile
 hwclock/Makefile
 include/Makefile
 lib/Makefile
-libs/Makefile
-libs/blkid/blkid.pc
-libs/blkid/Makefile
-libs/blkid/bin/Makefile
-libs/blkid/src/Makefile
-libs/blkid/src/probers/Makefile
 login-utils/Makefile
+Makefile
+misc-utils/chkdupexe:misc-utils/chkdupexe.pl
 misc-utils/Makefile
 mount/Makefile
 partx/Makefile
 po/Makefile.in
 schedutils/Makefile
+shlibs/blkid/bin/Makefile
+shlibs/blkid/blkid.pc
+shlibs/blkid/Makefile
+shlibs/blkid/src/Makefile
+shlibs/blkid/src/probers/Makefile
+shlibs/Makefile
 sys-utils/Makefile
-text-utils/Makefile
-tests/Makefile
-tests/helpers/Makefile
 tests/commands.sh
-misc-utils/chkdupexe:misc-utils/chkdupexe.pl
+tests/helpers/Makefile
+tests/Makefile
+text-utils/Makefile
 ])
 
 AC_OUTPUT
diff --git a/shlibs/blkid/src/Makefile.am b/shlibs/blkid/src/Makefile.am
index 805d0899..2b935e29 100644
--- a/shlibs/blkid/src/Makefile.am
+++ b/shlibs/blkid/src/Makefile.am
@@ -2,7 +2,7 @@ include $(top_srcdir)/config/include-Makefile.am
 
 SUBDIRS = probers .
 
-AM_CPPFLAGS += -I$(top_srcdir)/libs/blkid/src
+AM_CPPFLAGS += -I$(ul_libblkid_srcdir)
 
 common_ldadd =
 
@@ -28,9 +28,7 @@ libblkid_la_SOURCES = cache.c dev.c devname.c devno.c getsize.c llseek.c  \
 libblkid_la_LIBADD = probers/libblkid_probers.la $(common_ldadd)
 libblkid_la_DEPENDENCIES = $(libblkid_la_LIBADD) blkid.sym
 
-# TODO: for unknown reason "make distcheck" requires
-#       full path to the version script
-libblkid_la_LDFLAGS = -Wl,--version-script=$(top_srcdir)/libs/blkid/src/blkid.sym \
+libblkid_la_LDFLAGS = -Wl,--version-script=$(ul_libblkid_srcdir)/blkid.sym \
                       -version-info 1:0:0
 
 tests = test_cache test_config test_dev test_devname test_devno test_getsize \
diff --git a/shlibs/blkid/src/probers/Makefile.am b/shlibs/blkid/src/probers/Makefile.am
index d8a98ed2..4591db6a 100644
--- a/shlibs/blkid/src/probers/Makefile.am
+++ b/shlibs/blkid/src/probers/Makefile.am
@@ -1,6 +1,6 @@
 include $(top_srcdir)/config/include-Makefile.am
 
-AM_CPPFLAGS += -I$(top_srcdir)/libs/blkid/src
+AM_CPPFLAGS += -I$(ul_libblkid_srcdir)
 
 noinst_LTLIBRARIES = libblkid_probers.la
 libblkid_probers_la_SOURCES = \
diff --git a/tests/commands.sh.in b/tests/commands.sh.in
index 232ae630..c6a5e26b 100644
--- a/tests/commands.sh.in
+++ b/tests/commands.sh.in
@@ -45,6 +45,6 @@ TS_CMD_ISLOCAL=${TS_CMD_ISLOCAL-"$TOPDIR/login-utils/islocal_test"}
 TS_CMD_HWCLOCK=${TS_CMD_HWCLOCK-"$TOPDIR/hwclock/hwclock"}
 TS_CMD_LSCPU=${TS_CMD_LSCPU-"$TOPDIR/sys-utils/lscpu"}
 
-TS_CMD_BLKID=${TS_CMD_BLKID-"$TOPDIR/libs/blkid/bin/blkid"}
+TS_CMD_BLKID=${TS_CMD_BLKID-"$TOPDIR/shlibs/blkid/bin/blkid"}