36 files changed, 9 insertions, 9 deletions
diff --git a/Makefile.am b/Makefile.am
index a0271b719..77c774db2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,7 +3,7 @@ include $(top_srcdir)/config/include-Makefile.am
 SHLIBS_DIRS =
 
 if BUILD_LIBUUID
-SHLIBS_DIRS += shlibs/uuid
+SHLIBS_DIRS += libuuid
 endif
 
 if BUILD_LIBBLKID
diff --git a/config/include-Makefile.am b/config/include-Makefile.am
index b9caad5ab..2c8d9c587 100644
--- a/config/include-Makefile.am
+++ b/config/include-Makefile.am
@@ -24,9 +24,9 @@ $(ul_libblkid_la):
 
 
 # uuid
-ul_libuuid_srcdir = $(top_srcdir)/shlibs/uuid/src
-ul_libuuid_builddir = $(top_builddir)/shlibs/uuid/src
-ul_libuuid_la = $(top_builddir)/shlibs/uuid/src/libuuid.la
+ul_libuuid_srcdir = $(top_srcdir)/libuuid/src
+ul_libuuid_builddir = $(top_builddir)/libuuid/src
+ul_libuuid_la = $(top_builddir)/libuuid/src/libuuid.la
 
 $(ul_libuuid_la):
 	$(MAKE) -C $(ul_libuuid_builddir)
diff --git a/configure.ac b/configure.ac
index 12a45e619..d38058332 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1242,10 +1242,10 @@ shlibs/mount/src/libmount.h
 shlibs/mount/docs/Makefile
 shlibs/mount/docs/version.xml
 shlibs/mount/samples/Makefile
-shlibs/uuid/uuid.pc
-shlibs/uuid/Makefile
-shlibs/uuid/man/Makefile
-shlibs/uuid/src/Makefile
+libuuid/uuid.pc
+libuuid/Makefile
+libuuid/man/Makefile
+libuuid/src/Makefile
 sys-utils/Makefile
 term-utils/Makefile
 tests/commands.sh
diff --git a/shlibs/uuid/.gitignore b/libuuid/.gitignore
index f85e9721a..f85e9721a 100644
--- a/shlibs/uuid/.gitignore
+++ b/libuuid/.gitignore
diff --git a/shlibs/uuid/COPYING.libuuid b/libuuid/COPYING.libuuid
index 2f1706836..2f1706836 100644
--- a/shlibs/uuid/COPYING.libuuid
+++ b/libuuid/COPYING.libuuid
diff --git a/shlibs/uuid/Makefile.am b/libuuid/Makefile.am
index 66fe69098..66fe69098 100644
--- a/shlibs/uuid/Makefile.am
+++ b/libuuid/Makefile.am
diff --git a/shlibs/uuid/man/.gitignore b/libuuid/man/.gitignore
index 7957ad2cc..7957ad2cc 100644
--- a/shlibs/uuid/man/.gitignore
+++ b/libuuid/man/.gitignore
diff --git a/shlibs/uuid/man/Makefile.am b/libuuid/man/Makefile.am
index 8e9ed6d1f..8e9ed6d1f 100644
--- a/shlibs/uuid/man/Makefile.am
+++ b/libuuid/man/Makefile.am
diff --git a/shlibs/uuid/man/uuid.3 b/libuuid/man/uuid.3
index 4ae05f962..4ae05f962 100644
--- a/shlibs/uuid/man/uuid.3
+++ b/libuuid/man/uuid.3
diff --git a/shlibs/uuid/man/uuid_clear.3 b/libuuid/man/uuid_clear.3
index 5dfaa7905..5dfaa7905 100644
--- a/shlibs/uuid/man/uuid_clear.3
+++ b/libuuid/man/uuid_clear.3
diff --git a/shlibs/uuid/man/uuid_compare.3 b/libuuid/man/uuid_compare.3
index 1c633ffdf..1c633ffdf 100644
--- a/shlibs/uuid/man/uuid_compare.3
+++ b/libuuid/man/uuid_compare.3
diff --git a/shlibs/uuid/man/uuid_copy.3 b/libuuid/man/uuid_copy.3
index a720f56c4..a720f56c4 100644
--- a/shlibs/uuid/man/uuid_copy.3
+++ b/libuuid/man/uuid_copy.3
diff --git a/shlibs/uuid/man/uuid_generate.3 b/libuuid/man/uuid_generate.3
index 818505641..818505641 100644
--- a/shlibs/uuid/man/uuid_generate.3
+++ b/libuuid/man/uuid_generate.3
diff --git a/shlibs/uuid/man/uuid_is_null.3 b/libuuid/man/uuid_is_null.3
index 68ef6545e..68ef6545e 100644
--- a/shlibs/uuid/man/uuid_is_null.3
+++ b/libuuid/man/uuid_is_null.3
diff --git a/shlibs/uuid/man/uuid_parse.3 b/libuuid/man/uuid_parse.3
index faa0bcb52..faa0bcb52 100644
--- a/shlibs/uuid/man/uuid_parse.3
+++ b/libuuid/man/uuid_parse.3
diff --git a/shlibs/uuid/man/uuid_time.3 b/libuuid/man/uuid_time.3
index b2d1579cd..b2d1579cd 100644
--- a/shlibs/uuid/man/uuid_time.3
+++ b/libuuid/man/uuid_time.3
diff --git a/shlibs/uuid/man/uuid_unparse.3 b/libuuid/man/uuid_unparse.3
index cca68b17f..cca68b17f 100644
--- a/shlibs/uuid/man/uuid_unparse.3
+++ b/libuuid/man/uuid_unparse.3
diff --git a/shlibs/uuid/src/Makefile.am b/libuuid/src/Makefile.am
index 31cb9a2e1..31cb9a2e1 100644
--- a/shlibs/uuid/src/Makefile.am
+++ b/libuuid/src/Makefile.am
diff --git a/shlibs/uuid/src/clear.c b/libuuid/src/clear.c
index 2d91fee93..2d91fee93 100644
--- a/shlibs/uuid/src/clear.c
+++ b/libuuid/src/clear.c
diff --git a/shlibs/uuid/src/compare.c b/libuuid/src/compare.c
index 8f3437a2d..8f3437a2d 100644
--- a/shlibs/uuid/src/compare.c
+++ b/libuuid/src/compare.c
diff --git a/shlibs/uuid/src/copy.c b/libuuid/src/copy.c
index ead33aa26..ead33aa26 100644
--- a/shlibs/uuid/src/copy.c
+++ b/libuuid/src/copy.c
diff --git a/shlibs/uuid/src/gen_uuid.c b/libuuid/src/gen_uuid.c
index f4c89973f..f4c89973f 100644
--- a/shlibs/uuid/src/gen_uuid.c
+++ b/libuuid/src/gen_uuid.c
diff --git a/shlibs/uuid/src/gen_uuid_nt.c b/libuuid/src/gen_uuid_nt.c
index aa44bfd3d..aa44bfd3d 100644
--- a/shlibs/uuid/src/gen_uuid_nt.c
+++ b/libuuid/src/gen_uuid_nt.c
diff --git a/shlibs/uuid/src/isnull.c b/libuuid/src/isnull.c
index 931e7e7db..931e7e7db 100644
--- a/shlibs/uuid/src/isnull.c
+++ b/libuuid/src/isnull.c
diff --git a/shlibs/uuid/src/pack.c b/libuuid/src/pack.c
index 6e1247669..6e1247669 100644
--- a/shlibs/uuid/src/pack.c
+++ b/libuuid/src/pack.c
diff --git a/shlibs/uuid/src/parse.c b/libuuid/src/parse.c
index 074383efa..074383efa 100644
--- a/shlibs/uuid/src/parse.c
+++ b/libuuid/src/parse.c
diff --git a/shlibs/uuid/src/tst_uuid.c b/libuuid/src/tst_uuid.c
index e03138f7d..e03138f7d 100644
--- a/shlibs/uuid/src/tst_uuid.c
+++ b/libuuid/src/tst_uuid.c
diff --git a/shlibs/uuid/src/unpack.c b/libuuid/src/unpack.c
index beaaff3ca..beaaff3ca 100644
--- a/shlibs/uuid/src/unpack.c
+++ b/libuuid/src/unpack.c
diff --git a/shlibs/uuid/src/unparse.c b/libuuid/src/unparse.c
index a95bbb042..a95bbb042 100644
--- a/shlibs/uuid/src/unparse.c
+++ b/libuuid/src/unparse.c
diff --git a/shlibs/uuid/src/uuid.h b/libuuid/src/uuid.h
index 874d65a19..874d65a19 100644
--- a/shlibs/uuid/src/uuid.h
+++ b/libuuid/src/uuid.h
diff --git a/shlibs/uuid/src/uuid.sym b/libuuid/src/uuid.sym
index 2cad51bc6..2cad51bc6 100644
--- a/shlibs/uuid/src/uuid.sym
+++ b/libuuid/src/uuid.sym
diff --git a/shlibs/uuid/src/uuidP.h b/libuuid/src/uuidP.h
index 9d30ce2f8..9d30ce2f8 100644
--- a/shlibs/uuid/src/uuidP.h
+++ b/libuuid/src/uuidP.h
diff --git a/shlibs/uuid/src/uuid_time.c b/libuuid/src/uuid_time.c
index f25f5c90f..f25f5c90f 100644
--- a/shlibs/uuid/src/uuid_time.c
+++ b/libuuid/src/uuid_time.c
diff --git a/shlibs/uuid/src/uuidd.h b/libuuid/src/uuidd.h
index 27b79c216..27b79c216 100644
--- a/shlibs/uuid/src/uuidd.h
+++ b/libuuid/src/uuidd.h
diff --git a/shlibs/uuid/uuid.pc.in b/libuuid/uuid.pc.in
index 875de19bc..875de19bc 100644
--- a/shlibs/uuid/uuid.pc.in
+++ b/libuuid/uuid.pc.in
diff --git a/tests/commands.sh.in b/tests/commands.sh.in
index 41fb436ac..1b04825ff 100644
--- a/tests/commands.sh.in
+++ b/tests/commands.sh.in
@@ -27,7 +27,7 @@ TS_HELPER_LIBMOUNT_TABDIFF="$top_builddir/shlibs/mount/src/test_tab_diff"
 # TODO: use partx
 TS_HELPER_PARTITIONS="$top_builddir/shlibs/blkid/samples/partitions"
 
-U_L_LIBRARY_PATH="$top_builddir/shlibs/blkid/src/.libs:$top_builddir/shlibs/uuid/src/.libs"
+U_L_LIBRARY_PATH="$top_builddir/shlibs/blkid/src/.libs:$top_builddir/libuuid/src/.libs"
 
 # paths to commands
 TS_CMD_MOUNT=${TS_CMD_MOUNT:-"$top_builddir/mount/mount"}