39 files changed, 18 insertions, 18 deletions
diff --git a/Makefile.am b/Makefile.am
index 77c774db2..b116483cf 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,7 +11,7 @@ SHLIBS_DIRS += shlibs/blkid
 endif
 
 if BUILD_LIBMOUNT
-SHLIBS_DIRS += shlibs/mount
+SHLIBS_DIRS += libmount
 endif
 
 MAN_DIRS = man/ru
diff --git a/config/include-Makefile.am b/config/include-Makefile.am
index 2c8d9c587..49e45ccc2 100644
--- a/config/include-Makefile.am
+++ b/config/include-Makefile.am
@@ -33,9 +33,9 @@ $(ul_libuuid_la):
 
 
 # mount
-ul_libmount_srcdir = $(top_srcdir)/shlibs/mount/src
-ul_libmount_builddir = $(top_builddir)/shlibs/mount/src
-ul_libmount_la = $(top_builddir)/shlibs/mount/src/libmount.la
+ul_libmount_srcdir = $(top_srcdir)/libmount/src
+ul_libmount_builddir = $(top_builddir)/libmount/src
+ul_libmount_la = $(top_builddir)/libmount/src/libmount.la
 
 # libmount.h is generated by ./configure script and stored in build directory
 ul_libmount_incdir = $(ul_libmount_builddir)
diff --git a/configure.ac b/configure.ac
index d38058332..984b41bb0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1235,13 +1235,13 @@ shlibs/blkid/src/superblocks/Makefile
 shlibs/blkid/src/topology/Makefile
 shlibs/blkid/src/partitions/Makefile
 shlibs/blkid/samples/Makefile
-shlibs/mount/mount.pc
-shlibs/mount/Makefile
-shlibs/mount/src/Makefile
-shlibs/mount/src/libmount.h
-shlibs/mount/docs/Makefile
-shlibs/mount/docs/version.xml
-shlibs/mount/samples/Makefile
+libmount/mount.pc
+libmount/Makefile
+libmount/src/Makefile
+libmount/src/libmount.h
+libmount/docs/Makefile
+libmount/docs/version.xml
+libmount/samples/Makefile
 libuuid/uuid.pc
 libuuid/Makefile
 libuuid/man/Makefile
diff --git a/shlibs/mount/.gitignore b/libmount/.gitignore
index 7d203f5f9..7d203f5f9 100644
--- a/shlibs/mount/.gitignore
+++ b/libmount/.gitignore
diff --git a/shlibs/mount/COPYING.libmount b/libmount/COPYING.libmount
index 89d4489ce..89d4489ce 100644
--- a/shlibs/mount/COPYING.libmount
+++ b/libmount/COPYING.libmount
diff --git a/shlibs/mount/Makefile.am b/libmount/Makefile.am
index 26111c662..26111c662 100644
--- a/shlibs/mount/Makefile.am
+++ b/libmount/Makefile.am
diff --git a/shlibs/mount/docs/.gitignore b/libmount/docs/.gitignore
index 917c84810..917c84810 100644
--- a/shlibs/mount/docs/.gitignore
+++ b/libmount/docs/.gitignore
diff --git a/shlibs/mount/docs/Makefile.am b/libmount/docs/Makefile.am
index 3e087d294..3e087d294 100644
--- a/shlibs/mount/docs/Makefile.am
+++ b/libmount/docs/Makefile.am
diff --git a/shlibs/mount/docs/libmount-docs.xml b/libmount/docs/libmount-docs.xml
index 75802a282..75802a282 100644
--- a/shlibs/mount/docs/libmount-docs.xml
+++ b/libmount/docs/libmount-docs.xml
diff --git a/shlibs/mount/docs/libmount-sections.txt b/libmount/docs/libmount-sections.txt
index f79374d90..f79374d90 100644
--- a/shlibs/mount/docs/libmount-sections.txt
+++ b/libmount/docs/libmount-sections.txt
diff --git a/shlibs/mount/docs/libmount.types b/libmount/docs/libmount.types
index e69de29bb..e69de29bb 100644
--- a/shlibs/mount/docs/libmount.types
+++ b/libmount/docs/libmount.types
diff --git a/shlibs/mount/docs/version.xml.in b/libmount/docs/version.xml.in
index d78bda934..d78bda934 100644
--- a/shlibs/mount/docs/version.xml.in
+++ b/libmount/docs/version.xml.in
diff --git a/shlibs/mount/mount.pc.in b/libmount/mount.pc.in
index 2c327978b..2c327978b 100644
--- a/shlibs/mount/mount.pc.in
+++ b/libmount/mount.pc.in
diff --git a/shlibs/mount/samples/.gitignore b/libmount/samples/.gitignore
index 6008ee321..6008ee321 100644
--- a/shlibs/mount/samples/.gitignore
+++ b/libmount/samples/.gitignore
diff --git a/shlibs/mount/samples/Makefile.am b/libmount/samples/Makefile.am
index ee13d8b77..ee13d8b77 100644
--- a/shlibs/mount/samples/Makefile.am
+++ b/libmount/samples/Makefile.am
diff --git a/shlibs/mount/samples/mount.c b/libmount/samples/mount.c
index 086391e90..086391e90 100644
--- a/shlibs/mount/samples/mount.c
+++ b/libmount/samples/mount.c
diff --git a/shlibs/mount/samples/mountpoint.c b/libmount/samples/mountpoint.c
index 92d283054..92d283054 100644
--- a/shlibs/mount/samples/mountpoint.c
+++ b/libmount/samples/mountpoint.c
diff --git a/shlibs/mount/src/Makefile.am b/libmount/src/Makefile.am
index 56b0c207d..56b0c207d 100644
--- a/shlibs/mount/src/Makefile.am
+++ b/libmount/src/Makefile.am
diff --git a/shlibs/mount/src/cache.c b/libmount/src/cache.c
index 4775069c0..4775069c0 100644
--- a/shlibs/mount/src/cache.c
+++ b/libmount/src/cache.c
diff --git a/shlibs/mount/src/context.c b/libmount/src/context.c
index 6b0edc55b..6b0edc55b 100644
--- a/shlibs/mount/src/context.c
+++ b/libmount/src/context.c
diff --git a/shlibs/mount/src/context_mount.c b/libmount/src/context_mount.c
index 58c3ec10e..58c3ec10e 100644
--- a/shlibs/mount/src/context_mount.c
+++ b/libmount/src/context_mount.c
diff --git a/shlibs/mount/src/context_umount.c b/libmount/src/context_umount.c
index e10af52f2..e10af52f2 100644
--- a/shlibs/mount/src/context_umount.c
+++ b/libmount/src/context_umount.c
diff --git a/shlibs/mount/src/fs.c b/libmount/src/fs.c
index 02f401d95..02f401d95 100644
--- a/shlibs/mount/src/fs.c
+++ b/libmount/src/fs.c
diff --git a/shlibs/mount/src/init.c b/libmount/src/init.c
index d80a2d8ca..d80a2d8ca 100644
--- a/shlibs/mount/src/init.c
+++ b/libmount/src/init.c
diff --git a/shlibs/mount/src/iter.c b/libmount/src/iter.c
index 99fedd17b..99fedd17b 100644
--- a/shlibs/mount/src/iter.c
+++ b/libmount/src/iter.c
diff --git a/shlibs/mount/src/libmount.h.in b/libmount/src/libmount.h.in
index 15222083f..15222083f 100644
--- a/shlibs/mount/src/libmount.h.in
+++ b/libmount/src/libmount.h.in
diff --git a/shlibs/mount/src/libmount.sym b/libmount/src/libmount.sym
index a49891650..a49891650 100644
--- a/shlibs/mount/src/libmount.sym
+++ b/libmount/src/libmount.sym
diff --git a/shlibs/mount/src/lock.c b/libmount/src/lock.c
index 53c1115ec..53c1115ec 100644
--- a/shlibs/mount/src/lock.c
+++ b/libmount/src/lock.c
diff --git a/shlibs/mount/src/mountP.h b/libmount/src/mountP.h
index 0a8c7522c..0a8c7522c 100644
--- a/shlibs/mount/src/mountP.h
+++ b/libmount/src/mountP.h
diff --git a/shlibs/mount/src/optmap.c b/libmount/src/optmap.c
index 7db6d0314..7db6d0314 100644
--- a/shlibs/mount/src/optmap.c
+++ b/libmount/src/optmap.c
diff --git a/shlibs/mount/src/optstr.c b/libmount/src/optstr.c
index 406afc4b7..406afc4b7 100644
--- a/shlibs/mount/src/optstr.c
+++ b/libmount/src/optstr.c
diff --git a/shlibs/mount/src/tab.c b/libmount/src/tab.c
index 227c5aa43..227c5aa43 100644
--- a/shlibs/mount/src/tab.c
+++ b/libmount/src/tab.c
diff --git a/shlibs/mount/src/tab_diff.c b/libmount/src/tab_diff.c
index d1a17bcb9..d1a17bcb9 100644
--- a/shlibs/mount/src/tab_diff.c
+++ b/libmount/src/tab_diff.c
diff --git a/shlibs/mount/src/tab_parse.c b/libmount/src/tab_parse.c
index 7419f3742..7419f3742 100644
--- a/shlibs/mount/src/tab_parse.c
+++ b/libmount/src/tab_parse.c
diff --git a/shlibs/mount/src/tab_update.c b/libmount/src/tab_update.c
index 88125bfbb..88125bfbb 100644
--- a/shlibs/mount/src/tab_update.c
+++ b/libmount/src/tab_update.c
diff --git a/shlibs/mount/src/test.c b/libmount/src/test.c
index 2da00b40d..2da00b40d 100644
--- a/shlibs/mount/src/test.c
+++ b/libmount/src/test.c
diff --git a/shlibs/mount/src/utils.c b/libmount/src/utils.c
index 8f0e49c9b..8f0e49c9b 100644
--- a/shlibs/mount/src/utils.c
+++ b/libmount/src/utils.c
diff --git a/shlibs/mount/src/version.c b/libmount/src/version.c
index a3b6d0bcd..a3b6d0bcd 100644
--- a/shlibs/mount/src/version.c
+++ b/libmount/src/version.c
diff --git a/tests/commands.sh.in b/tests/commands.sh.in
index 1b04825ff..e976b9971 100644
--- a/tests/commands.sh.in
+++ b/tests/commands.sh.in
@@ -16,13 +16,13 @@ TS_HELPER_STRUTILS="$top_builddir/lib/test_strutils"
 TS_HELPER_CPUSET="$top_builddir/lib/test_cpuset"
 
 # libmount
-TS_HELPER_LIBMOUNT_OPTSTR="$top_builddir/shlibs/mount/src/test_optstr"
-TS_HELPER_LIBMOUNT_TAB="$top_builddir/shlibs/mount/src/test_tab"
-TS_HELPER_LIBMOUNT_UTILS="$top_builddir/shlibs/mount/src/test_utils"
-TS_HELPER_LIBMOUNT_LOCK="$top_builddir/shlibs/mount/src/test_lock"
-TS_HELPER_LIBMOUNT_UPDATE="$top_builddir/shlibs/mount/src/test_tab_update"
-TS_HELPER_LIBMOUNT_CONTEXT="$top_builddir/shlibs/mount/src/test_context"
-TS_HELPER_LIBMOUNT_TABDIFF="$top_builddir/shlibs/mount/src/test_tab_diff"
+TS_HELPER_LIBMOUNT_OPTSTR="$top_builddir/libmount/src/test_optstr"
+TS_HELPER_LIBMOUNT_TAB="$top_builddir/libmount/src/test_tab"
+TS_HELPER_LIBMOUNT_UTILS="$top_builddir/libmount/src/test_utils"
+TS_HELPER_LIBMOUNT_LOCK="$top_builddir/libmount/src/test_lock"
+TS_HELPER_LIBMOUNT_UPDATE="$top_builddir/libmount/src/test_tab_update"
+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"