volume_id: rename subdirectory

36 files changed, 8 insertions, 8 deletions

diff --git a/extras/volume_id/Makefile b/extras/volume_id/Makefile
index 88752b880e..78dfd867bc 100644
--- a/extras/volume_id/Makefile
+++ b/extras/volume_id/Makefile
@@ -31,12 +31,12 @@ all: $(PROG) $(MAN_PAGES)
 	$(E) "  CC      " $@
 	$(Q) $(CC) -c $(CFLAGS) $< -o $@
 
-libvolume_id/libvolume_id.a:
-	$(Q) $(MAKE) -C libvolume_id
+lib/libvolume_id.a:
+	$(Q) $(MAKE) -C lib
 
-$(PROG): %: $(HEADERS) %.o libvolume_id/libvolume_id.a
+$(PROG): %: $(HEADERS) %.o lib/libvolume_id.a
 	$(E) "  LD      " $@
-	$(Q) $(LD) $(LDFLAGS) -o $@ $@.o $(LIBUDEV) libvolume_id/libvolume_id.a $(LIB_OBJS)
+	$(Q) $(LD) $(LDFLAGS) -o $@ $@.o $(LIBUDEV) lib/libvolume_id.a $(LIB_OBJS)
 ifneq ($(strip $(STRIPCMD)),)
 	$(E) "  STRIP   " $@
 	$(Q) $(STRIPCMD) $@
@@ -51,17 +51,17 @@ endif
 clean:
 	$(E) "  CLEAN   "
 	$(Q) rm -f $(PROG) $(OBJS) $(GEN_HEADERS)
-	$(Q) $(MAKE) -C libvolume_id clean
+	$(Q) $(MAKE) -C lib clean
 .PHONY: clean
 
 install-bin: all
 	$(INSTALL_PROGRAM) -D $(PROG) $(DESTDIR)$(sbindir)/$(PROG)
-	$(MAKE) -C libvolume_id install
+	$(MAKE) -C lib install
 .PHONY: install-bin
 
 uninstall-bin:
 	- rm $(DESTDIR)$(sbindir)/$(PROG)
-	$(MAKE) -C libvolume_id uninstall
+	$(MAKE) -C lib uninstall
 .PHONY: uninstall-bin
 
 install-man:
diff --git a/extras/volume_id/libvolume_id/Makefile b/extras/volume_id/lib/Makefile
index 6a12f0e67a..6a12f0e67a 100644
--- a/extras/volume_id/libvolume_id/Makefile
+++ b/extras/volume_id/lib/Makefile
diff --git a/extras/volume_id/libvolume_id/cramfs.c b/extras/volume_id/lib/cramfs.c
index beb34d5bc0..beb34d5bc0 100644
--- a/extras/volume_id/libvolume_id/cramfs.c
+++ b/extras/volume_id/lib/cramfs.c
diff --git a/extras/volume_id/libvolume_id/ext.c b/extras/volume_id/lib/ext.c
index 51c0011218..51c0011218 100644
--- a/extras/volume_id/libvolume_id/ext.c
+++ b/extras/volume_id/lib/ext.c
diff --git a/extras/volume_id/libvolume_id/fat.c b/extras/volume_id/lib/fat.c
index 4840a2a23c..4840a2a23c 100644
--- a/extras/volume_id/libvolume_id/fat.c
+++ b/extras/volume_id/lib/fat.c
diff --git a/extras/volume_id/libvolume_id/hfs.c b/extras/volume_id/lib/hfs.c
index a6e378dd28..a6e378dd28 100644
--- a/extras/volume_id/libvolume_id/hfs.c
+++ b/extras/volume_id/lib/hfs.c
diff --git a/extras/volume_id/libvolume_id/highpoint.c b/extras/volume_id/lib/highpoint.c
index deba540ad5..deba540ad5 100644
--- a/extras/volume_id/libvolume_id/highpoint.c
+++ b/extras/volume_id/lib/highpoint.c
diff --git a/extras/volume_id/libvolume_id/hpfs.c b/extras/volume_id/lib/hpfs.c
index 3e9589fcca..3e9589fcca 100644
--- a/extras/volume_id/libvolume_id/hpfs.c
+++ b/extras/volume_id/lib/hpfs.c
diff --git a/extras/volume_id/libvolume_id/iso9660.c b/extras/volume_id/lib/iso9660.c
index 7b78a7e992..7b78a7e992 100644
--- a/extras/volume_id/libvolume_id/iso9660.c
+++ b/extras/volume_id/lib/iso9660.c
diff --git a/extras/volume_id/libvolume_id/isw_raid.c b/extras/volume_id/lib/isw_raid.c
index 6465a31bf5..6465a31bf5 100644
--- a/extras/volume_id/libvolume_id/isw_raid.c
+++ b/extras/volume_id/lib/isw_raid.c
diff --git a/extras/volume_id/libvolume_id/jfs.c b/extras/volume_id/lib/jfs.c
index b230fb258c..b230fb258c 100644
--- a/extras/volume_id/libvolume_id/jfs.c
+++ b/extras/volume_id/lib/jfs.c
diff --git a/extras/volume_id/libvolume_id/libvolume_id.h b/extras/volume_id/lib/libvolume_id.h
index 7faf8d8af3..7faf8d8af3 100644
--- a/extras/volume_id/libvolume_id/libvolume_id.h
+++ b/extras/volume_id/lib/libvolume_id.h
diff --git a/extras/volume_id/libvolume_id/linux_raid.c b/extras/volume_id/lib/linux_raid.c
index 85e8d8109b..85e8d8109b 100644
--- a/extras/volume_id/libvolume_id/linux_raid.c
+++ b/extras/volume_id/lib/linux_raid.c
diff --git a/extras/volume_id/libvolume_id/linux_swap.c b/extras/volume_id/lib/linux_swap.c
index 0193648c9e..0193648c9e 100644
--- a/extras/volume_id/libvolume_id/linux_swap.c
+++ b/extras/volume_id/lib/linux_swap.c
diff --git a/extras/volume_id/libvolume_id/lsi_raid.c b/extras/volume_id/lib/lsi_raid.c
index f1db4a6e50..f1db4a6e50 100644
--- a/extras/volume_id/libvolume_id/lsi_raid.c
+++ b/extras/volume_id/lib/lsi_raid.c
diff --git a/extras/volume_id/libvolume_id/luks.c b/extras/volume_id/lib/luks.c
index 64de85ac21..64de85ac21 100644
--- a/extras/volume_id/libvolume_id/luks.c
+++ b/extras/volume_id/lib/luks.c
diff --git a/extras/volume_id/libvolume_id/lvm.c b/extras/volume_id/lib/lvm.c
index 47d84b0968..47d84b0968 100644
--- a/extras/volume_id/libvolume_id/lvm.c
+++ b/extras/volume_id/lib/lvm.c
diff --git a/extras/volume_id/libvolume_id/minix.c b/extras/volume_id/lib/minix.c
index 75e9c3acbd..75e9c3acbd 100644
--- a/extras/volume_id/libvolume_id/minix.c
+++ b/extras/volume_id/lib/minix.c
diff --git a/extras/volume_id/libvolume_id/ntfs.c b/extras/volume_id/lib/ntfs.c
index 23c64fc307..23c64fc307 100644
--- a/extras/volume_id/libvolume_id/ntfs.c
+++ b/extras/volume_id/lib/ntfs.c
diff --git a/extras/volume_id/libvolume_id/nvidia_raid.c b/extras/volume_id/lib/nvidia_raid.c
index 10c1c714f7..10c1c714f7 100644
--- a/extras/volume_id/libvolume_id/nvidia_raid.c
+++ b/extras/volume_id/lib/nvidia_raid.c
diff --git a/extras/volume_id/libvolume_id/ocfs.c b/extras/volume_id/lib/ocfs.c
index b376ead833..b376ead833 100644
--- a/extras/volume_id/libvolume_id/ocfs.c
+++ b/extras/volume_id/lib/ocfs.c
diff --git a/extras/volume_id/libvolume_id/promise_raid.c b/extras/volume_id/lib/promise_raid.c
index 2a2ce1689e..2a2ce1689e 100644
--- a/extras/volume_id/libvolume_id/promise_raid.c
+++ b/extras/volume_id/lib/promise_raid.c
diff --git a/extras/volume_id/libvolume_id/reiserfs.c b/extras/volume_id/lib/reiserfs.c
index b5706f86e0..b5706f86e0 100644
--- a/extras/volume_id/libvolume_id/reiserfs.c
+++ b/extras/volume_id/lib/reiserfs.c
diff --git a/extras/volume_id/libvolume_id/romfs.c b/extras/volume_id/lib/romfs.c
index 8bb2a0018a..8bb2a0018a 100644
--- a/extras/volume_id/libvolume_id/romfs.c
+++ b/extras/volume_id/lib/romfs.c
diff --git a/extras/volume_id/libvolume_id/silicon_raid.c b/extras/volume_id/lib/silicon_raid.c
index 017b023e27..017b023e27 100644
--- a/extras/volume_id/libvolume_id/silicon_raid.c
+++ b/extras/volume_id/lib/silicon_raid.c
diff --git a/extras/volume_id/libvolume_id/squashfs.c b/extras/volume_id/lib/squashfs.c
index bdb1f16628..bdb1f16628 100644
--- a/extras/volume_id/libvolume_id/squashfs.c
+++ b/extras/volume_id/lib/squashfs.c
diff --git a/extras/volume_id/libvolume_id/sysv.c b/extras/volume_id/lib/sysv.c
index 52349c0623..52349c0623 100644
--- a/extras/volume_id/libvolume_id/sysv.c
+++ b/extras/volume_id/lib/sysv.c
diff --git a/extras/volume_id/libvolume_id/udf.c b/extras/volume_id/lib/udf.c
index d7497ec51b..d7497ec51b 100644
--- a/extras/volume_id/libvolume_id/udf.c
+++ b/extras/volume_id/lib/udf.c
diff --git a/extras/volume_id/libvolume_id/ufs.c b/extras/volume_id/lib/ufs.c
index d3960b1bec..d3960b1bec 100644
--- a/extras/volume_id/libvolume_id/ufs.c
+++ b/extras/volume_id/lib/ufs.c
diff --git a/extras/volume_id/libvolume_id/util.c b/extras/volume_id/lib/util.c
index cf5392cf9a..cf5392cf9a 100644
--- a/extras/volume_id/libvolume_id/util.c
+++ b/extras/volume_id/lib/util.c
diff --git a/extras/volume_id/libvolume_id/util.h b/extras/volume_id/lib/util.h
index 1d1b53bb57..1d1b53bb57 100644
--- a/extras/volume_id/libvolume_id/util.h
+++ b/extras/volume_id/lib/util.h
diff --git a/extras/volume_id/libvolume_id/via_raid.c b/extras/volume_id/lib/via_raid.c
index 42cb098065..42cb098065 100644
--- a/extras/volume_id/libvolume_id/via_raid.c
+++ b/extras/volume_id/lib/via_raid.c
diff --git a/extras/volume_id/libvolume_id/volume_id.c b/extras/volume_id/lib/volume_id.c
index 073ad79c77..073ad79c77 100644
--- a/extras/volume_id/libvolume_id/volume_id.c
+++ b/extras/volume_id/lib/volume_id.c
diff --git a/extras/volume_id/libvolume_id/vxfs.c b/extras/volume_id/lib/vxfs.c
index d10cc37762..d10cc37762 100644
--- a/extras/volume_id/libvolume_id/vxfs.c
+++ b/extras/volume_id/lib/vxfs.c
diff --git a/extras/volume_id/libvolume_id/xfs.c b/extras/volume_id/lib/xfs.c
index 3d870c41e7..3d870c41e7 100644
--- a/extras/volume_id/libvolume_id/xfs.c
+++ b/extras/volume_id/lib/xfs.c
diff --git a/extras/volume_id/vol_id.c b/extras/volume_id/vol_id.c
index b086b3710c..3a7361a6ac 100644
--- a/extras/volume_id/vol_id.c
+++ b/extras/volume_id/vol_id.c
@@ -31,7 +31,7 @@
 #include <sys/ioctl.h>
 
 #include "../../udev.h"
-#include "libvolume_id/libvolume_id.h"
+#include "lib/libvolume_id.h"
 
 #define BLKGETSIZE64 _IOR(0x12,114,size_t)