build-sys: fix lsblk building

Signed-off-by: Karel Zak <kzak@redhat.com>

diff --git a/misc-utils/Makefile.am b/misc-utils/Makefile.am
index b60ab0edb641ef14d3ae8a456128026f9b6ca37c..8b1dbbe2e2b538971333baa55d433b746595aa6f 100644 (file)
--- a/misc-utils/Makefile.am
+++ b/misc-utils/Makefile.am
@@ -6,16 +6,11 @@ bin_PROGRAMS =
 sbin_PROGRAMS =
 usrsbin_exec_PROGRAMS =
 
-usrbin_exec_PROGRAMS = cal ddate logger look lsblk mcookie \
+usrbin_exec_PROGRAMS = cal ddate logger look mcookie \
        namei script whereis scriptreplay
 EXTRA_DIST += README.cal README.ddate README.namei README.namei2
 
 mcookie_SOURCES = mcookie.c $(top_srcdir)/lib/md5.c
-lsblk_SOURCES = lsblk.c \
-               $(top_srcdir)/lib/canonicalize.c \
-               $(top_srcdir)/lib/ismounted.c \
-               $(top_srcdir)/lib/tt.c \
-               $(top_srcdir)/lib/strutils.c
 script_LDADD =
 
 usrbin_exec_SCRIPTS = chkdupexe
@@ -23,7 +18,7 @@ usrbin_exec_SCRIPTS = chkdupexe
 CLEANFILES = chkdupexe
 
 dist_man_MANS = cal.1 chkdupexe.1 ddate.1 logger.1 look.1 mcookie.1 \
-       lsblk.1 namei.1 script.1 whereis.1 scriptreplay.1
+               namei.1 script.1 whereis.1 scriptreplay.1
 
 namei_SOURCES = namei.c $(top_srcdir)/lib/strutils.c
 
@@ -47,11 +42,21 @@ blkid_SOURCES = blkid.c $(top_srcdir)/lib/ismounted.c \
                $(top_srcdir)/lib/strutils.c
 blkid_LDADD = $(ul_libblkid_la)
 blkid_CFLAGS = $(AM_CFLAGS) -I$(ul_libblkid_incdir)
+
 findfs_LDADD = $(ul_libblkid_la)
 findfs_CFLAGS = $(AM_CFLAGS) -I$(ul_libblkid_incdir)
+
 wipefs_SOURCES = wipefs.c $(top_srcdir)/lib/strutils.c
 wipefs_LDADD = $(ul_libblkid_la)
 wipefs_CFLAGS = $(AM_CFLAGS) -I$(ul_libblkid_incdir)
+
+bin_PROGRAMS += lsblk
+dist_man_MANS += lsblk.8
+lsblk_SOURCES = lsblk.c \
+               $(top_srcdir)/lib/canonicalize.c \
+               $(top_srcdir)/lib/ismounted.c \
+               $(top_srcdir)/lib/tt.c \
+               $(top_srcdir)/lib/strutils.c
 lsblk_LDADD = $(ul_libblkid_la)
 lsblk_CFLAGS = $(AM_CFLAGS) -I$(ul_libblkid_incdir)
 if HAVE_STATIC_BLKID

diff --git a/misc-utils/lsblk.c b/misc-utils/lsblk.c
index f863e1c6c8546360afcf711b04b6ce5bb399905b..6c5a205dbda115942c36431e7c7a7ff356c9c7c6 100644 (file)
--- a/misc-utils/lsblk.c
+++ b/misc-utils/lsblk.c
@@ -1,5 +1,5 @@
 /*
- * lsblk(1) - list block devices
+ * lsblk(8) - list block devices
  *
  * Copyright (C) 2010 Red Hat, Inc. All rights reserved.
  * Written by Milan Broz <mbroz@redhat.com>
@@ -915,7 +915,7 @@ static int __attribute__((__noreturn__)) help(FILE *out)
        for (i = 0; i < __NCOLUMNS; i++)
                fprintf(out, " %10s  %s\n", infos[i].name, gettext(infos[i].help));
 
-       fprintf(out, _("\nFor more information see lsblk(1).\n"));
+       fprintf(out, _("\nFor more information see lsblk(8).\n"));
 
        exit(out == stderr ? EXIT_FAILURE : EXIT_SUCCESS);
 }