116 files changed, 16 insertions, 16 deletions
diff --git a/Makefile.am b/Makefile.am
index b116483cf..01a28bb7e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,7 +7,7 @@ SHLIBS_DIRS += libuuid
 endif
 
 if BUILD_LIBBLKID
-SHLIBS_DIRS += shlibs/blkid
+SHLIBS_DIRS += libblkid
 endif
 
 if BUILD_LIBMOUNT
diff --git a/config/include-Makefile.am b/config/include-Makefile.am
index 49e45ccc2..8c41ad194 100644
--- a/config/include-Makefile.am
+++ b/config/include-Makefile.am
@@ -12,9 +12,9 @@ dist_noinst_DATA = $(dist_man_MANS)
 # Paths to in-tree libraries (use ul_ prefix to avoid possible collisions)
 #
 # blkid
-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_srcdir = $(top_srcdir)/libblkid/src
+ul_libblkid_builddir = $(top_builddir)/libblkid/src
+ul_libblkid_la = $(top_builddir)/libblkid/src/libblkid.la
 
 # blkid.h is generated by ./configure script and stored in build directory
 ul_libblkid_incdir = $(ul_libblkid_builddir)
diff --git a/configure.ac b/configure.ac
index 984b41bb0..3524623e6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1225,16 +1225,16 @@ mount/Makefile
 partx/Makefile
 po/Makefile.in
 schedutils/Makefile
-shlibs/blkid/blkid.pc
-shlibs/blkid/Makefile
-shlibs/blkid/docs/Makefile
-shlibs/blkid/docs/version.xml
-shlibs/blkid/src/Makefile
-shlibs/blkid/src/blkid.h
-shlibs/blkid/src/superblocks/Makefile
-shlibs/blkid/src/topology/Makefile
-shlibs/blkid/src/partitions/Makefile
-shlibs/blkid/samples/Makefile
+libblkid/blkid.pc
+libblkid/Makefile
+libblkid/docs/Makefile
+libblkid/docs/version.xml
+libblkid/src/Makefile
+libblkid/src/blkid.h
+libblkid/src/superblocks/Makefile
+libblkid/src/topology/Makefile
+libblkid/src/partitions/Makefile
+libblkid/samples/Makefile
 libmount/mount.pc
 libmount/Makefile
 libmount/src/Makefile
diff --git a/shlibs/blkid/.gitignore b/libblkid/.gitignore
index 6ffe4a9e5..6ffe4a9e5 100644
--- a/shlibs/blkid/.gitignore
+++ b/libblkid/.gitignore
diff --git a/shlibs/blkid/COPYING.libblkid b/libblkid/COPYING.libblkid
index cf9b6b997..cf9b6b997 100644
--- a/shlibs/blkid/COPYING.libblkid
+++ b/libblkid/COPYING.libblkid
diff --git a/shlibs/blkid/Makefile.am b/libblkid/Makefile.am
index 59362cfe5..59362cfe5 100644
--- a/shlibs/blkid/Makefile.am
+++ b/libblkid/Makefile.am
diff --git a/shlibs/blkid/README.blkid b/libblkid/README.blkid
index 4fa9be1f7..4fa9be1f7 100644
--- a/shlibs/blkid/README.blkid
+++ b/libblkid/README.blkid
diff --git a/shlibs/blkid/blkid.pc.in b/libblkid/blkid.pc.in
index 40ec8a9d7..40ec8a9d7 100644
--- a/shlibs/blkid/blkid.pc.in
+++ b/libblkid/blkid.pc.in
diff --git a/shlibs/blkid/docs/.gitignore b/libblkid/docs/.gitignore
index 917c84810..917c84810 100644
--- a/shlibs/blkid/docs/.gitignore
+++ b/libblkid/docs/.gitignore
diff --git a/shlibs/blkid/docs/Makefile.am b/libblkid/docs/Makefile.am
index 8ef3b239b..8ef3b239b 100644
--- a/shlibs/blkid/docs/Makefile.am
+++ b/libblkid/docs/Makefile.am
diff --git a/shlibs/blkid/docs/libblkid-config.xml b/libblkid/docs/libblkid-config.xml
index 89fbb7f17..89fbb7f17 100644
--- a/shlibs/blkid/docs/libblkid-config.xml
+++ b/libblkid/docs/libblkid-config.xml
diff --git a/shlibs/blkid/docs/libblkid-docs.xml b/libblkid/docs/libblkid-docs.xml
index c99192a96..c99192a96 100644
--- a/shlibs/blkid/docs/libblkid-docs.xml
+++ b/libblkid/docs/libblkid-docs.xml
diff --git a/shlibs/blkid/docs/libblkid-sections.txt b/libblkid/docs/libblkid-sections.txt
index 47675f4ae..47675f4ae 100644
--- a/shlibs/blkid/docs/libblkid-sections.txt
+++ b/libblkid/docs/libblkid-sections.txt
diff --git a/shlibs/blkid/docs/libblkid.types b/libblkid/docs/libblkid.types
index e69de29bb..e69de29bb 100644
--- a/shlibs/blkid/docs/libblkid.types
+++ b/libblkid/docs/libblkid.types
diff --git a/shlibs/blkid/docs/version.xml.in b/libblkid/docs/version.xml.in
index d78bda934..d78bda934 100644
--- a/shlibs/blkid/docs/version.xml.in
+++ b/libblkid/docs/version.xml.in
diff --git a/shlibs/blkid/libblkid.3 b/libblkid/libblkid.3
index 15412a51c..15412a51c 100644
--- a/shlibs/blkid/libblkid.3
+++ b/libblkid/libblkid.3
diff --git a/shlibs/blkid/samples/.gitignore b/libblkid/samples/.gitignore
index 409e5cff7..409e5cff7 100644
--- a/shlibs/blkid/samples/.gitignore
+++ b/libblkid/samples/.gitignore
diff --git a/shlibs/blkid/samples/Makefile.am b/libblkid/samples/Makefile.am
index 93588d57d..93588d57d 100644
--- a/shlibs/blkid/samples/Makefile.am
+++ b/libblkid/samples/Makefile.am
diff --git a/shlibs/blkid/samples/mkfs.c b/libblkid/samples/mkfs.c
index 5c3ebe79e..5c3ebe79e 100644
--- a/shlibs/blkid/samples/mkfs.c
+++ b/libblkid/samples/mkfs.c
diff --git a/shlibs/blkid/samples/partitions.c b/libblkid/samples/partitions.c
index 3b5273649..3b5273649 100644
--- a/shlibs/blkid/samples/partitions.c
+++ b/libblkid/samples/partitions.c
diff --git a/shlibs/blkid/samples/superblocks.c b/libblkid/samples/superblocks.c
index 20e39c97e..20e39c97e 100644
--- a/shlibs/blkid/samples/superblocks.c
+++ b/libblkid/samples/superblocks.c
diff --git a/shlibs/blkid/samples/topology.c b/libblkid/samples/topology.c
index de1c3a5e3..de1c3a5e3 100644
--- a/shlibs/blkid/samples/topology.c
+++ b/libblkid/samples/topology.c
diff --git a/shlibs/blkid/src/Makefile.am b/libblkid/src/Makefile.am
index 543f2f629..543f2f629 100644
--- a/shlibs/blkid/src/Makefile.am
+++ b/libblkid/src/Makefile.am
diff --git a/shlibs/blkid/src/blkid.h.in b/libblkid/src/blkid.h.in
index 05527bed8..05527bed8 100644
--- a/shlibs/blkid/src/blkid.h.in
+++ b/libblkid/src/blkid.h.in
diff --git a/shlibs/blkid/src/blkid.sym b/libblkid/src/blkid.sym
index e758ff1a6..e758ff1a6 100644
--- a/shlibs/blkid/src/blkid.sym
+++ b/libblkid/src/blkid.sym
diff --git a/shlibs/blkid/src/blkidP.h b/libblkid/src/blkidP.h
index aeeebc165..aeeebc165 100644
--- a/shlibs/blkid/src/blkidP.h
+++ b/libblkid/src/blkidP.h
diff --git a/shlibs/blkid/src/cache.c b/libblkid/src/cache.c
index feec6ddfc..feec6ddfc 100644
--- a/shlibs/blkid/src/cache.c
+++ b/libblkid/src/cache.c
diff --git a/shlibs/blkid/src/config.c b/libblkid/src/config.c
index 110251a92..110251a92 100644
--- a/shlibs/blkid/src/config.c
+++ b/libblkid/src/config.c
diff --git a/shlibs/blkid/src/dev.c b/libblkid/src/dev.c
index 791a6c181..791a6c181 100644
--- a/shlibs/blkid/src/dev.c
+++ b/libblkid/src/dev.c
diff --git a/shlibs/blkid/src/devname.c b/libblkid/src/devname.c
index e1fc2c849..e1fc2c849 100644
--- a/shlibs/blkid/src/devname.c
+++ b/libblkid/src/devname.c
diff --git a/shlibs/blkid/src/devno.c b/libblkid/src/devno.c
index 9a356a84f..9a356a84f 100644
--- a/shlibs/blkid/src/devno.c
+++ b/libblkid/src/devno.c
diff --git a/shlibs/blkid/src/encode.c b/libblkid/src/encode.c
index 03d5f4ef1..03d5f4ef1 100644
--- a/shlibs/blkid/src/encode.c
+++ b/libblkid/src/encode.c
diff --git a/shlibs/blkid/src/evaluate.c b/libblkid/src/evaluate.c
index 88c6830e8..88c6830e8 100644
--- a/shlibs/blkid/src/evaluate.c
+++ b/libblkid/src/evaluate.c
diff --git a/shlibs/blkid/src/getsize.c b/libblkid/src/getsize.c
index abe6ebc9c..abe6ebc9c 100644
--- a/shlibs/blkid/src/getsize.c
+++ b/libblkid/src/getsize.c
diff --git a/shlibs/blkid/src/llseek.c b/libblkid/src/llseek.c
index 5bd0e5167..5bd0e5167 100644
--- a/shlibs/blkid/src/llseek.c
+++ b/libblkid/src/llseek.c
diff --git a/shlibs/blkid/src/partitions/Makefile.am b/libblkid/src/partitions/Makefile.am
index f617389d8..f617389d8 100644
--- a/shlibs/blkid/src/partitions/Makefile.am
+++ b/libblkid/src/partitions/Makefile.am
diff --git a/shlibs/blkid/src/partitions/aix.c b/libblkid/src/partitions/aix.c
index be0ad2b46..be0ad2b46 100644
--- a/shlibs/blkid/src/partitions/aix.c
+++ b/libblkid/src/partitions/aix.c
diff --git a/shlibs/blkid/src/partitions/aix.h b/libblkid/src/partitions/aix.h
index f767c5a37..f767c5a37 100644
--- a/shlibs/blkid/src/partitions/aix.h
+++ b/libblkid/src/partitions/aix.h
diff --git a/shlibs/blkid/src/partitions/blkid_parttypes.h b/libblkid/src/partitions/blkid_parttypes.h
index 707e53d93..707e53d93 100644
--- a/shlibs/blkid/src/partitions/blkid_parttypes.h
+++ b/libblkid/src/partitions/blkid_parttypes.h
diff --git a/shlibs/blkid/src/partitions/bsd.c b/libblkid/src/partitions/bsd.c
index ee15ad2fe..ee15ad2fe 100644
--- a/shlibs/blkid/src/partitions/bsd.c
+++ b/libblkid/src/partitions/bsd.c
diff --git a/shlibs/blkid/src/partitions/dos.c b/libblkid/src/partitions/dos.c
index 72ac7788c..72ac7788c 100644
--- a/shlibs/blkid/src/partitions/dos.c
+++ b/libblkid/src/partitions/dos.c
diff --git a/shlibs/blkid/src/partitions/dos.h b/libblkid/src/partitions/dos.h
index 130aa0115..130aa0115 100644
--- a/shlibs/blkid/src/partitions/dos.h
+++ b/libblkid/src/partitions/dos.h
diff --git a/shlibs/blkid/src/partitions/gpt.c b/libblkid/src/partitions/gpt.c
index 9281a8943..9281a8943 100644
--- a/shlibs/blkid/src/partitions/gpt.c
+++ b/libblkid/src/partitions/gpt.c
diff --git a/shlibs/blkid/src/partitions/mac.c b/libblkid/src/partitions/mac.c
index 538b27270..538b27270 100644
--- a/shlibs/blkid/src/partitions/mac.c
+++ b/libblkid/src/partitions/mac.c
diff --git a/shlibs/blkid/src/partitions/minix.c b/libblkid/src/partitions/minix.c
index 0887d1a3b..0887d1a3b 100644
--- a/shlibs/blkid/src/partitions/minix.c
+++ b/libblkid/src/partitions/minix.c
diff --git a/shlibs/blkid/src/partitions/partitions.c b/libblkid/src/partitions/partitions.c
index 89f058718..89f058718 100644
--- a/shlibs/blkid/src/partitions/partitions.c
+++ b/libblkid/src/partitions/partitions.c
diff --git a/shlibs/blkid/src/partitions/partitions.h b/libblkid/src/partitions/partitions.h
index c4ccd3b65..c4ccd3b65 100644
--- a/shlibs/blkid/src/partitions/partitions.h
+++ b/libblkid/src/partitions/partitions.h
diff --git a/shlibs/blkid/src/partitions/sgi.c b/libblkid/src/partitions/sgi.c
index 945ead542..945ead542 100644
--- a/shlibs/blkid/src/partitions/sgi.c
+++ b/libblkid/src/partitions/sgi.c
diff --git a/shlibs/blkid/src/partitions/solaris_x86.c b/libblkid/src/partitions/solaris_x86.c
index ce102bd8f..ce102bd8f 100644
--- a/shlibs/blkid/src/partitions/solaris_x86.c
+++ b/libblkid/src/partitions/solaris_x86.c
diff --git a/shlibs/blkid/src/partitions/sun.c b/libblkid/src/partitions/sun.c
index dffab24c6..dffab24c6 100644
--- a/shlibs/blkid/src/partitions/sun.c
+++ b/libblkid/src/partitions/sun.c
diff --git a/shlibs/blkid/src/partitions/ultrix.c b/libblkid/src/partitions/ultrix.c
index cc848d0a6..cc848d0a6 100644
--- a/shlibs/blkid/src/partitions/ultrix.c
+++ b/libblkid/src/partitions/ultrix.c
diff --git a/shlibs/blkid/src/partitions/unixware.c b/libblkid/src/partitions/unixware.c
index ac11a46d3..ac11a46d3 100644
--- a/shlibs/blkid/src/partitions/unixware.c
+++ b/libblkid/src/partitions/unixware.c
diff --git a/shlibs/blkid/src/probe.c b/libblkid/src/probe.c
index 85db814f0..85db814f0 100644
--- a/shlibs/blkid/src/probe.c
+++ b/libblkid/src/probe.c
diff --git a/shlibs/blkid/src/read.c b/libblkid/src/read.c
index c404bb010..c404bb010 100644
--- a/shlibs/blkid/src/read.c
+++ b/libblkid/src/read.c
diff --git a/shlibs/blkid/src/resolve.c b/libblkid/src/resolve.c
index bf13b8648..bf13b8648 100644
--- a/shlibs/blkid/src/resolve.c
+++ b/libblkid/src/resolve.c
diff --git a/shlibs/blkid/src/save.c b/libblkid/src/save.c
index a71b06878..a71b06878 100644
--- a/shlibs/blkid/src/save.c
+++ b/libblkid/src/save.c
diff --git a/shlibs/blkid/src/superblocks/Makefile.am b/libblkid/src/superblocks/Makefile.am
index 1501fab11..1501fab11 100644
--- a/shlibs/blkid/src/superblocks/Makefile.am
+++ b/libblkid/src/superblocks/Makefile.am
diff --git a/shlibs/blkid/src/superblocks/adaptec_raid.c b/libblkid/src/superblocks/adaptec_raid.c
index 570e75e9f..570e75e9f 100644
--- a/shlibs/blkid/src/superblocks/adaptec_raid.c
+++ b/libblkid/src/superblocks/adaptec_raid.c
diff --git a/shlibs/blkid/src/superblocks/befs.c b/libblkid/src/superblocks/befs.c
index c78dc208e..c78dc208e 100644
--- a/shlibs/blkid/src/superblocks/befs.c
+++ b/libblkid/src/superblocks/befs.c
diff --git a/shlibs/blkid/src/superblocks/bfs.c b/libblkid/src/superblocks/bfs.c
index 8a34c583a..8a34c583a 100644
--- a/shlibs/blkid/src/superblocks/bfs.c
+++ b/libblkid/src/superblocks/bfs.c
diff --git a/shlibs/blkid/src/superblocks/btrfs.c b/libblkid/src/superblocks/btrfs.c
index 51bbadc7c..51bbadc7c 100644
--- a/shlibs/blkid/src/superblocks/btrfs.c
+++ b/libblkid/src/superblocks/btrfs.c
diff --git a/shlibs/blkid/src/superblocks/cramfs.c b/libblkid/src/superblocks/cramfs.c
index b58ed08cb..b58ed08cb 100644
--- a/shlibs/blkid/src/superblocks/cramfs.c
+++ b/libblkid/src/superblocks/cramfs.c
diff --git a/shlibs/blkid/src/superblocks/ddf_raid.c b/libblkid/src/superblocks/ddf_raid.c
index c0ba33517..c0ba33517 100644
--- a/shlibs/blkid/src/superblocks/ddf_raid.c
+++ b/libblkid/src/superblocks/ddf_raid.c
diff --git a/shlibs/blkid/src/superblocks/drbd.c b/libblkid/src/superblocks/drbd.c
index 3490948de..3490948de 100644
--- a/shlibs/blkid/src/superblocks/drbd.c
+++ b/libblkid/src/superblocks/drbd.c
diff --git a/shlibs/blkid/src/superblocks/exfat.c b/libblkid/src/superblocks/exfat.c
index bada3a83a..bada3a83a 100644
--- a/shlibs/blkid/src/superblocks/exfat.c
+++ b/libblkid/src/superblocks/exfat.c
diff --git a/shlibs/blkid/src/superblocks/ext.c b/libblkid/src/superblocks/ext.c
index 6dfe52831..6dfe52831 100644
--- a/shlibs/blkid/src/superblocks/ext.c
+++ b/libblkid/src/superblocks/ext.c
diff --git a/shlibs/blkid/src/superblocks/gfs.c b/libblkid/src/superblocks/gfs.c
index b2c016304..b2c016304 100644
--- a/shlibs/blkid/src/superblocks/gfs.c
+++ b/libblkid/src/superblocks/gfs.c
diff --git a/shlibs/blkid/src/superblocks/hfs.c b/libblkid/src/superblocks/hfs.c
index e043994e3..e043994e3 100644
--- a/shlibs/blkid/src/superblocks/hfs.c
+++ b/libblkid/src/superblocks/hfs.c
diff --git a/shlibs/blkid/src/superblocks/highpoint_raid.c b/libblkid/src/superblocks/highpoint_raid.c
index 25e3114b3..25e3114b3 100644
--- a/shlibs/blkid/src/superblocks/highpoint_raid.c
+++ b/libblkid/src/superblocks/highpoint_raid.c
diff --git a/shlibs/blkid/src/superblocks/hpfs.c b/libblkid/src/superblocks/hpfs.c
index f9b851a47..f9b851a47 100644
--- a/shlibs/blkid/src/superblocks/hpfs.c
+++ b/libblkid/src/superblocks/hpfs.c
diff --git a/shlibs/blkid/src/superblocks/iso9660.c b/libblkid/src/superblocks/iso9660.c
index 9f3ce2e60..9f3ce2e60 100644
--- a/shlibs/blkid/src/superblocks/iso9660.c
+++ b/libblkid/src/superblocks/iso9660.c
diff --git a/shlibs/blkid/src/superblocks/isw_raid.c b/libblkid/src/superblocks/isw_raid.c
index ac6251d7c..ac6251d7c 100644
--- a/shlibs/blkid/src/superblocks/isw_raid.c
+++ b/libblkid/src/superblocks/isw_raid.c
diff --git a/shlibs/blkid/src/superblocks/jfs.c b/libblkid/src/superblocks/jfs.c
index 9a49c6746..9a49c6746 100644
--- a/shlibs/blkid/src/superblocks/jfs.c
+++ b/libblkid/src/superblocks/jfs.c
diff --git a/shlibs/blkid/src/superblocks/jmicron_raid.c b/libblkid/src/superblocks/jmicron_raid.c
index d35b17f89..d35b17f89 100644
--- a/shlibs/blkid/src/superblocks/jmicron_raid.c
+++ b/libblkid/src/superblocks/jmicron_raid.c
diff --git a/shlibs/blkid/src/superblocks/linux_raid.c b/libblkid/src/superblocks/linux_raid.c
index e74f57de9..e74f57de9 100644
--- a/shlibs/blkid/src/superblocks/linux_raid.c
+++ b/libblkid/src/superblocks/linux_raid.c
diff --git a/shlibs/blkid/src/superblocks/lsi_raid.c b/libblkid/src/superblocks/lsi_raid.c
index 5217a0093..5217a0093 100644
--- a/shlibs/blkid/src/superblocks/lsi_raid.c
+++ b/libblkid/src/superblocks/lsi_raid.c
diff --git a/shlibs/blkid/src/superblocks/luks.c b/libblkid/src/superblocks/luks.c
index f716e31c3..f716e31c3 100644
--- a/shlibs/blkid/src/superblocks/luks.c
+++ b/libblkid/src/superblocks/luks.c
diff --git a/shlibs/blkid/src/superblocks/lvm.c b/libblkid/src/superblocks/lvm.c
index 3a9807c8d..3a9807c8d 100644
--- a/shlibs/blkid/src/superblocks/lvm.c
+++ b/libblkid/src/superblocks/lvm.c
diff --git a/shlibs/blkid/src/superblocks/minix.c b/libblkid/src/superblocks/minix.c
index 3290c2755..3290c2755 100644
--- a/shlibs/blkid/src/superblocks/minix.c
+++ b/libblkid/src/superblocks/minix.c
diff --git a/shlibs/blkid/src/superblocks/netware.c b/libblkid/src/superblocks/netware.c
index 7ef216254..7ef216254 100644
--- a/shlibs/blkid/src/superblocks/netware.c
+++ b/libblkid/src/superblocks/netware.c
diff --git a/shlibs/blkid/src/superblocks/nilfs.c b/libblkid/src/superblocks/nilfs.c
index 1f8f3a69f..1f8f3a69f 100644
--- a/shlibs/blkid/src/superblocks/nilfs.c
+++ b/libblkid/src/superblocks/nilfs.c
diff --git a/shlibs/blkid/src/superblocks/ntfs.c b/libblkid/src/superblocks/ntfs.c
index 98f3fb2f9..98f3fb2f9 100644
--- a/shlibs/blkid/src/superblocks/ntfs.c
+++ b/libblkid/src/superblocks/ntfs.c
diff --git a/shlibs/blkid/src/superblocks/nvidia_raid.c b/libblkid/src/superblocks/nvidia_raid.c
index c3db949a8..c3db949a8 100644
--- a/shlibs/blkid/src/superblocks/nvidia_raid.c
+++ b/libblkid/src/superblocks/nvidia_raid.c
diff --git a/shlibs/blkid/src/superblocks/ocfs.c b/libblkid/src/superblocks/ocfs.c
index 9dbf41b15..9dbf41b15 100644
--- a/shlibs/blkid/src/superblocks/ocfs.c
+++ b/libblkid/src/superblocks/ocfs.c
diff --git a/shlibs/blkid/src/superblocks/promise_raid.c b/libblkid/src/superblocks/promise_raid.c
index 0e91d3c25..0e91d3c25 100644
--- a/shlibs/blkid/src/superblocks/promise_raid.c
+++ b/libblkid/src/superblocks/promise_raid.c
diff --git a/shlibs/blkid/src/superblocks/reiserfs.c b/libblkid/src/superblocks/reiserfs.c
index 921f5237e..921f5237e 100644
--- a/shlibs/blkid/src/superblocks/reiserfs.c
+++ b/libblkid/src/superblocks/reiserfs.c
diff --git a/shlibs/blkid/src/superblocks/romfs.c b/libblkid/src/superblocks/romfs.c
index 91ef996fe..91ef996fe 100644
--- a/shlibs/blkid/src/superblocks/romfs.c
+++ b/libblkid/src/superblocks/romfs.c
diff --git a/shlibs/blkid/src/superblocks/silicon_raid.c b/libblkid/src/superblocks/silicon_raid.c
index b72b72760..b72b72760 100644
--- a/shlibs/blkid/src/superblocks/silicon_raid.c
+++ b/libblkid/src/superblocks/silicon_raid.c
diff --git a/shlibs/blkid/src/superblocks/squashfs.c b/libblkid/src/superblocks/squashfs.c
index 45f102917..45f102917 100644
--- a/shlibs/blkid/src/superblocks/squashfs.c
+++ b/libblkid/src/superblocks/squashfs.c
diff --git a/shlibs/blkid/src/superblocks/superblocks.c b/libblkid/src/superblocks/superblocks.c
index 56a454332..56a454332 100644
--- a/shlibs/blkid/src/superblocks/superblocks.c
+++ b/libblkid/src/superblocks/superblocks.c
diff --git a/shlibs/blkid/src/superblocks/superblocks.h b/libblkid/src/superblocks/superblocks.h
index a79d7cb6c..a79d7cb6c 100644
--- a/shlibs/blkid/src/superblocks/superblocks.h
+++ b/libblkid/src/superblocks/superblocks.h
diff --git a/shlibs/blkid/src/superblocks/swap.c b/libblkid/src/superblocks/swap.c
index 325a8fafa..325a8fafa 100644
--- a/shlibs/blkid/src/superblocks/swap.c
+++ b/libblkid/src/superblocks/swap.c
diff --git a/shlibs/blkid/src/superblocks/sysv.c b/libblkid/src/superblocks/sysv.c
index 00c8c978b..00c8c978b 100644
--- a/shlibs/blkid/src/superblocks/sysv.c
+++ b/libblkid/src/superblocks/sysv.c
diff --git a/shlibs/blkid/src/superblocks/ubifs.c b/libblkid/src/superblocks/ubifs.c
index 87d94ba2c..87d94ba2c 100644
--- a/shlibs/blkid/src/superblocks/ubifs.c
+++ b/libblkid/src/superblocks/ubifs.c
diff --git a/shlibs/blkid/src/superblocks/udf.c b/libblkid/src/superblocks/udf.c
index 766d6980f..766d6980f 100644
--- a/shlibs/blkid/src/superblocks/udf.c
+++ b/libblkid/src/superblocks/udf.c
diff --git a/shlibs/blkid/src/superblocks/ufs.c b/libblkid/src/superblocks/ufs.c
index 05bed1451..05bed1451 100644
--- a/shlibs/blkid/src/superblocks/ufs.c
+++ b/libblkid/src/superblocks/ufs.c
diff --git a/shlibs/blkid/src/superblocks/vfat.c b/libblkid/src/superblocks/vfat.c
index 1584efae9..1584efae9 100644
--- a/shlibs/blkid/src/superblocks/vfat.c
+++ b/libblkid/src/superblocks/vfat.c
diff --git a/shlibs/blkid/src/superblocks/via_raid.c b/libblkid/src/superblocks/via_raid.c
index 201313801..201313801 100644
--- a/shlibs/blkid/src/superblocks/via_raid.c
+++ b/libblkid/src/superblocks/via_raid.c
diff --git a/shlibs/blkid/src/superblocks/vmfs.c b/libblkid/src/superblocks/vmfs.c
index ead09a8d1..ead09a8d1 100644
--- a/shlibs/blkid/src/superblocks/vmfs.c
+++ b/libblkid/src/superblocks/vmfs.c
diff --git a/shlibs/blkid/src/superblocks/vxfs.c b/libblkid/src/superblocks/vxfs.c
index fdab85a72..fdab85a72 100644
--- a/shlibs/blkid/src/superblocks/vxfs.c
+++ b/libblkid/src/superblocks/vxfs.c
diff --git a/shlibs/blkid/src/superblocks/xfs.c b/libblkid/src/superblocks/xfs.c
index 1399fe13a..1399fe13a 100644
--- a/shlibs/blkid/src/superblocks/xfs.c
+++ b/libblkid/src/superblocks/xfs.c
diff --git a/shlibs/blkid/src/superblocks/zfs.c b/libblkid/src/superblocks/zfs.c
index af5264d46..af5264d46 100644
--- a/shlibs/blkid/src/superblocks/zfs.c
+++ b/libblkid/src/superblocks/zfs.c
diff --git a/shlibs/blkid/src/tag.c b/libblkid/src/tag.c
index 0dbe1ff5a..0dbe1ff5a 100644
--- a/shlibs/blkid/src/tag.c
+++ b/libblkid/src/tag.c
diff --git a/shlibs/blkid/src/topology/Makefile.am b/libblkid/src/topology/Makefile.am
index 775fea3e0..775fea3e0 100644
--- a/shlibs/blkid/src/topology/Makefile.am
+++ b/libblkid/src/topology/Makefile.am
diff --git a/shlibs/blkid/src/topology/dm.c b/libblkid/src/topology/dm.c
index 8f33911c0..8f33911c0 100644
--- a/shlibs/blkid/src/topology/dm.c
+++ b/libblkid/src/topology/dm.c
diff --git a/shlibs/blkid/src/topology/evms.c b/libblkid/src/topology/evms.c
index a30d8df75..a30d8df75 100644
--- a/shlibs/blkid/src/topology/evms.c
+++ b/libblkid/src/topology/evms.c
diff --git a/shlibs/blkid/src/topology/ioctl.c b/libblkid/src/topology/ioctl.c
index 73c18ec9b..73c18ec9b 100644
--- a/shlibs/blkid/src/topology/ioctl.c
+++ b/libblkid/src/topology/ioctl.c
diff --git a/shlibs/blkid/src/topology/lvm.c b/libblkid/src/topology/lvm.c
index 54438b0ad..54438b0ad 100644
--- a/shlibs/blkid/src/topology/lvm.c
+++ b/libblkid/src/topology/lvm.c
diff --git a/shlibs/blkid/src/topology/md.c b/libblkid/src/topology/md.c
index d7275edd6..d7275edd6 100644
--- a/shlibs/blkid/src/topology/md.c
+++ b/libblkid/src/topology/md.c
diff --git a/shlibs/blkid/src/topology/sysfs.c b/libblkid/src/topology/sysfs.c
index 588fc7a13..588fc7a13 100644
--- a/shlibs/blkid/src/topology/sysfs.c
+++ b/libblkid/src/topology/sysfs.c
diff --git a/shlibs/blkid/src/topology/topology.c b/libblkid/src/topology/topology.c
index 27dc755fd..27dc755fd 100644
--- a/shlibs/blkid/src/topology/topology.c
+++ b/libblkid/src/topology/topology.c
diff --git a/shlibs/blkid/src/topology/topology.h b/libblkid/src/topology/topology.h
index 6d2f43345..6d2f43345 100644
--- a/shlibs/blkid/src/topology/topology.h
+++ b/libblkid/src/topology/topology.h
diff --git a/shlibs/blkid/src/tst_types.c b/libblkid/src/tst_types.c
index ecbc03217..ecbc03217 100644
--- a/shlibs/blkid/src/tst_types.c
+++ b/libblkid/src/tst_types.c
diff --git a/shlibs/blkid/src/verify.c b/libblkid/src/verify.c
index a0cb3fea2..a0cb3fea2 100644
--- a/shlibs/blkid/src/verify.c
+++ b/libblkid/src/verify.c
diff --git a/shlibs/blkid/src/version.c b/libblkid/src/version.c
index 4c7fa06ca..4c7fa06ca 100644
--- a/shlibs/blkid/src/version.c
+++ b/libblkid/src/version.c
diff --git a/tests/commands.sh.in b/tests/commands.sh.in
index e976b9971..4f70da73e 100644
--- a/tests/commands.sh.in
+++ b/tests/commands.sh.in
@@ -25,9 +25,9 @@ TS_HELPER_LIBMOUNT_CONTEXT="$top_builddir/libmount/src/test_context"
 TS_HELPER_LIBMOUNT_TABDIFF="$top_builddir/libmount/src/test_tab_diff"
 
 # TODO: use partx
-TS_HELPER_PARTITIONS="$top_builddir/shlibs/blkid/samples/partitions"
+TS_HELPER_PARTITIONS="$top_builddir/libblkid/samples/partitions"
 
-U_L_LIBRARY_PATH="$top_builddir/shlibs/blkid/src/.libs:$top_builddir/libuuid/src/.libs"
+U_L_LIBRARY_PATH="$top_builddir/libblkid/src/.libs:$top_builddir/libuuid/src/.libs"
 
 # paths to commands
 TS_CMD_MOUNT=${TS_CMD_MOUNT:-"$top_builddir/mount/mount"}