diff options
| author | LaMont Jones <lamont@debian.org> | 2011-01-31 20:15:49 -0700 |
|---|---|---|
| committer | LaMont Jones <lamont@debian.org> | 2011-01-31 20:15:49 -0700 |
| commit | 11292d25510e67c83c6580401eccd42d6d6da931 (patch) | |
| tree | ca5850da93c90f8798d7ff115e0124edffb8bb97 /misc-utils/Makefile.am | |
| parent | 4f9e177060fb5ad6e574598aefdf2d5f50a8b54f (diff) | |
| parent | 9f55bf3794ca98852dd1f352f993dea60d83a2e1 (diff) | |
| download | util-linux-old-11292d25510e67c83c6580401eccd42d6d6da931.tar.gz | |
Merge remote branch 'origin/master'
Conflicts:
mount/mount.8
mount/mount.c
Diffstat (limited to 'misc-utils/Makefile.am')
| -rw-r--r-- | misc-utils/Makefile.am | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/misc-utils/Makefile.am b/misc-utils/Makefile.am index 8b1dbbe2..3f0843b2 100644 --- a/misc-utils/Makefile.am +++ b/misc-utils/Makefile.am @@ -50,6 +50,7 @@ wipefs_SOURCES = wipefs.c $(top_srcdir)/lib/strutils.c wipefs_LDADD = $(ul_libblkid_la) wipefs_CFLAGS = $(AM_CFLAGS) -I$(ul_libblkid_incdir) +if LINUX bin_PROGRAMS += lsblk dist_man_MANS += lsblk.8 lsblk_SOURCES = lsblk.c \ @@ -59,6 +60,8 @@ lsblk_SOURCES = lsblk.c \ $(top_srcdir)/lib/strutils.c lsblk_LDADD = $(ul_libblkid_la) lsblk_CFLAGS = $(AM_CFLAGS) -I$(ul_libblkid_incdir) +endif + if HAVE_STATIC_BLKID sbin_PROGRAMS += blkid.static blkid_static_SOURCES = $(blkid_SOURCES) |