From: Mike Frysinger <vapier@gentoo.org>
Date: Sun, 11 Oct 2009 00:07:16 +0000 (-0400)
Subject: build-sys: move fsck/mkfs for bfs/cramfs/minix to /usr
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d4fa971c42467fb69e5d89d28e1b98c491a1505a;p=util-linux

build-sys: move fsck/mkfs for bfs/cramfs/minix to /usr

The bfs/cramfs/minix rarely (if ever?) are used for root filesystems, so
it doesn't make much sense to keep them in the root partition.  Move them
to /usr by default.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---

diff --git a/disk-utils/Makefile.am b/disk-utils/Makefile.am
index 852ae8a0..eb4cf565 100644
--- a/disk-utils/Makefile.am
+++ b/disk-utils/Makefile.am
@@ -8,17 +8,18 @@ endif
 dist_man_MANS = isosize.8 mkfs.8 mkswap.8 \
            fsck.minix.8 mkfs.minix.8 mkfs.bfs.8
 
-sbin_PROGRAMS = mkfs mkswap fsck.minix mkfs.minix mkfs.bfs
-fsck_minix_SOURCES = fsck.minix.c minix.h
-mkfs_minix_SOURCES = mkfs.minix.c minix.h $(utils_common)
-mkfs_bfs_SOURCES = mkfs.bfs.c $(utils_common)
+sbin_PROGRAMS = mkfs mkswap
 
 mkswap_SOURCES = mkswap.c $(utils_common) ../lib/wholedisk.c
 mkswap_LDADD =
 mkswap_CFLAGS =
 
 usrbin_exec_PROGRAMS = isosize
-usrsbin_exec_PROGRAMS =
+usrsbin_exec_PROGRAMS = fsck.minix mkfs.minix mkfs.bfs
+
+fsck_minix_SOURCES = fsck.minix.c minix.h
+mkfs_minix_SOURCES = mkfs.minix.c minix.h $(utils_common)
+mkfs_bfs_SOURCES = mkfs.bfs.c $(utils_common)
 
 if LINUX
 dist_man_MANS += fdformat.8 blockdev.8
@@ -42,7 +43,7 @@ endif
 
 if BUILD_CRAMFS
 cramfs_common = $(utils_common) cramfs.h cramfs_common.c cramfs_common.h
-sbin_PROGRAMS += fsck.cramfs mkfs.cramfs
+usrsbin_exec_PROGRAMS += fsck.cramfs mkfs.cramfs
 fsck_cramfs_SOURCES = fsck.cramfs.c $(cramfs_common)
 mkfs_cramfs_SOURCES = mkfs.cramfs.c $(cramfs_common) ../lib/md5.c
 fsck_cramfs_LDADD = -lz