Imported from util-linux-2.13-pre2 tarball.

12 files changed, 67 insertions, 206 deletions

diff --git a/disk-utils/Makefile.am b/disk-utils/Makefile.am
index acca3deed..0e3208213 100644
--- a/disk-utils/Makefile.am
+++ b/disk-utils/Makefile.am
@@ -8,9 +8,7 @@ fsck_minix_SOURCES = fsck.minix.c
 mkfs_minix_SOURCES = mkfs.minix.c
 mkfs_bfs_SOURCES = mkfs.bfs.c
 
-usrbin_PROGRAMS = fdformat isosize
-
-dist_sysconf_DATA = fdprm
+usrbinexec_PROGRAMS = fdformat isosize
 
 if BUILD_ELVTUNE
 sbin_PROGRAMS += elvtune
@@ -19,7 +17,7 @@ endif
 
 if HAVE_RAW
 if BUILD_RAW
-usrbin_PROGRAMS += raw
+usrbinexec_PROGRAMS += raw
 man_MANS += raw.8
 endif
 endif
@@ -29,7 +27,7 @@ sbin_PROGRAMS += fsck.cramfs mkfs.cramfs
 fsck_cramfs_SOURCES = fsck.cramfs.c
 mkfs_cramfs_SOURCES = mkfs.cramfs.c
 fsck_cramfs_LDADD = -lz
-mkfs_cramfs_LDADD = -lz $(top_srcdir)/lib/libmd5.la
+mkfs_cramfs_LDADD = -lz $(top_srcdir)/lib/libmd5.a
 endif
 
 if HAVE_UUID
diff --git a/disk-utils/Makefile.in b/disk-utils/Makefile.in
index 4095736ed..11601b2d2 100644
--- a/disk-utils/Makefile.in
+++ b/disk-utils/Makefile.in
@@ -14,7 +14,6 @@
 
 @SET_MAKE@
 
-
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
@@ -37,12 +36,13 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-DIST_COMMON = $(dist_sysconf_DATA) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in $(top_srcdir)/config/include-Makefile.am
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+	$(top_srcdir)/config/include-Makefile.am
 sbin_PROGRAMS = mkfs$(EXEEXT) mkswap$(EXEEXT) blockdev$(EXEEXT) \
 	fsck.minix$(EXEEXT) mkfs.minix$(EXEEXT) mkfs.bfs$(EXEEXT) \
 	$(am__EXEEXT_1) $(am__EXEEXT_2)
-usrbin_PROGRAMS = fdformat$(EXEEXT) isosize$(EXEEXT) $(am__EXEEXT_3)
+usrbinexec_PROGRAMS = fdformat$(EXEEXT) isosize$(EXEEXT) \
+	$(am__EXEEXT_3)
 @BUILD_ELVTUNE_TRUE@am__append_1 = elvtune
 @BUILD_ELVTUNE_TRUE@am__append_2 = elvtune.8
 @BUILD_RAW_TRUE@@HAVE_RAW_TRUE@am__append_3 = raw
@@ -63,12 +63,12 @@ CONFIG_CLEAN_FILES =
 @BUILD_ELVTUNE_TRUE@am__EXEEXT_1 = elvtune$(EXEEXT)
 @HAVE_ZLIB_TRUE@am__EXEEXT_2 = fsck.cramfs$(EXEEXT) \
 @HAVE_ZLIB_TRUE@	mkfs.cramfs$(EXEEXT)
-am__installdirs = "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(usrbindir)" \
-	"$(DESTDIR)$(man8dir)" "$(DESTDIR)$(sysconfdir)"
+am__installdirs = "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(usrbinexecdir)" \
+	"$(DESTDIR)$(man8dir)"
 sbinPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 @BUILD_RAW_TRUE@@HAVE_RAW_TRUE@am__EXEEXT_3 = raw$(EXEEXT)
-usrbinPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
-PROGRAMS = $(sbin_PROGRAMS) $(usrbin_PROGRAMS)
+usrbinexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+PROGRAMS = $(sbin_PROGRAMS) $(usrbinexec_PROGRAMS)
 blockdev_SOURCES = blockdev.c
 blockdev_OBJECTS = blockdev.$(OBJEXT)
 blockdev_LDADD = $(LDADD)
@@ -97,8 +97,7 @@ mkfs_bfs_LDADD = $(LDADD)
 am__mkfs_cramfs_SOURCES_DIST = mkfs.cramfs.c
 @HAVE_ZLIB_TRUE@am_mkfs_cramfs_OBJECTS = mkfs.cramfs.$(OBJEXT)
 mkfs_cramfs_OBJECTS = $(am_mkfs_cramfs_OBJECTS)
-@HAVE_ZLIB_TRUE@mkfs_cramfs_DEPENDENCIES =  \
-@HAVE_ZLIB_TRUE@	$(top_srcdir)/lib/libmd5.la
+@HAVE_ZLIB_TRUE@mkfs_cramfs_DEPENDENCIES = $(top_srcdir)/lib/libmd5.a
 am_mkfs_minix_OBJECTS = mkfs.minix.$(OBJEXT)
 mkfs_minix_OBJECTS = $(am_mkfs_minix_OBJECTS)
 mkfs_minix_LDADD = $(LDADD)
@@ -112,12 +111,8 @@ depcomp = $(SHELL) $(top_srcdir)/config/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 SOURCES = blockdev.c elvtune.c fdformat.c $(fsck_cramfs_SOURCES) \
 	$(fsck_minix_SOURCES) isosize.c mkfs.c $(mkfs_bfs_SOURCES) \
 	$(mkfs_cramfs_SOURCES) $(mkfs_minix_SOURCES) mkswap.c raw.c
@@ -129,14 +124,6 @@ DIST_SOURCES = blockdev.c elvtune.c fdformat.c \
 man8dir = $(mandir)/man8
 NROFF = nroff
 MANS = $(man_MANS)
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-dist_sysconfDATA_INSTALL = $(INSTALL_DATA)
-DATA = $(dist_sysconf_DATA)
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -144,7 +131,6 @@ ACLOCAL = @ACLOCAL@
 AMDEP_FALSE = @AMDEP_FALSE@
 AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
-AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
@@ -184,21 +170,14 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
 DEPDIR = @DEPDIR@
-ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
 GMSGFMT = @GMSGFMT@
 HAVE_BLKID_FALSE = @HAVE_BLKID_FALSE@
 HAVE_BLKID_TRUE = @HAVE_BLKID_TRUE@
@@ -233,8 +212,6 @@ LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LN_S = @LN_S@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
@@ -267,16 +244,11 @@ USE_TTY_GROUP_FALSE = @USE_TTY_GROUP_FALSE@
 USE_TTY_GROUP_TRUE = @USE_TTY_GROUP_TRUE@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
-ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
 ac_ct_RANLIB = @ac_ct_RANLIB@
 ac_ct_STRIP = @ac_ct_STRIP@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -310,9 +282,9 @@ sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-usrbindir = $(prefix)/usr/bin
-usrsbindir = $(prefix)/usr/sbin
-AM_CPPFLAGS = -include ../config.h -I$(top_srcdir)/include
+usrbinexecdir = $(prefix)/usr/bin
+usrsbinexecdir = $(prefix)/usr/sbin
+AM_CPPFLAGS = -include $(top_srcdir)/config.h -I$(top_srcdir)/include
 DEFAULT_INCLUDES = 
 man_MANS = blockdev.8 fdformat.8 isosize.8 mkfs.8 mkswap.8 \
 	fsck.minix.8 mkfs.minix.8 mkfs.bfs.8 $(am__append_2) \
@@ -320,16 +292,15 @@ man_MANS = blockdev.8 fdformat.8 isosize.8 mkfs.8 mkswap.8 \
 fsck_minix_SOURCES = fsck.minix.c
 mkfs_minix_SOURCES = mkfs.minix.c
 mkfs_bfs_SOURCES = mkfs.bfs.c
-dist_sysconf_DATA = fdprm
 @HAVE_ZLIB_TRUE@fsck_cramfs_SOURCES = fsck.cramfs.c
 @HAVE_ZLIB_TRUE@mkfs_cramfs_SOURCES = mkfs.cramfs.c
 @HAVE_ZLIB_TRUE@fsck_cramfs_LDADD = -lz
-@HAVE_ZLIB_TRUE@mkfs_cramfs_LDADD = -lz $(top_srcdir)/lib/libmd5.la
+@HAVE_ZLIB_TRUE@mkfs_cramfs_LDADD = -lz $(top_srcdir)/lib/libmd5.a
 @HAVE_UUID_TRUE@mkswap_LDADD = -luuid
 all: all-am
 
 .SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
+.SUFFIXES: .c .o .obj
 $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/config/include-Makefile.am $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -365,11 +336,10 @@ install-sbinPROGRAMS: $(sbin_PROGRAMS)
 	@list='$(sbin_PROGRAMS)'; for p in $$list; do \
 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
 	  if test -f $$p \
-	     || test -f $$p1 \
 	  ; then \
 	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(sbinPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(sbindir)/$$f'"; \
-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(sbinPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(sbindir)/$$f" || exit 1; \
+	   echo " $(INSTALL_PROGRAM_ENV) $(sbinPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(sbindir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(sbinPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(sbindir)/$$f" || exit 1; \
 	  else :; fi; \
 	done
 
@@ -382,71 +352,30 @@ uninstall-sbinPROGRAMS:
 	done
 
 clean-sbinPROGRAMS:
-	@list='$(sbin_PROGRAMS)'; for p in $$list; do \
-	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  echo " rm -f $$p $$f"; \
-	  rm -f $$p $$f ; \
-	done
-
-installcheck-sbinPROGRAMS: $(sbin_PROGRAMS)
-	bad=0; pid=$$$$; list="$(sbin_PROGRAMS)"; for p in $$list; do \
-	  case ' $(AM_INSTALLCHECK_STD_OPTIONS_EXEMPT) ' in \
-	   *" $$p "* | *" $(srcdir)/$$p "*) continue;; \
-	  esac; \
-	  f=`echo "$$p" | \
-	     sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-	  for opt in --help --version; do \
-	    if "$(DESTDIR)$(sbindir)/$$f" $$opt >c$${pid}_.out \
-	         2>c$${pid}_.err </dev/null \
-		 && test -n "`cat c$${pid}_.out`" \
-		 && test -z "`cat c$${pid}_.err`"; then :; \
-	    else echo "$$f does not support $$opt" 1>&2; bad=1; fi; \
-	  done; \
-	done; rm -f c$${pid}_.???; exit $$bad
-install-usrbinPROGRAMS: $(usrbin_PROGRAMS)
+	-test -z "$(sbin_PROGRAMS)" || rm -f $(sbin_PROGRAMS)
+install-usrbinexecPROGRAMS: $(usrbinexec_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	test -z "$(usrbindir)" || $(mkdir_p) "$(DESTDIR)$(usrbindir)"
-	@list='$(usrbin_PROGRAMS)'; for p in $$list; do \
+	test -z "$(usrbinexecdir)" || $(mkdir_p) "$(DESTDIR)$(usrbinexecdir)"
+	@list='$(usrbinexec_PROGRAMS)'; for p in $$list; do \
 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
 	  if test -f $$p \
-	     || test -f $$p1 \
 	  ; then \
 	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(usrbinPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(usrbindir)/$$f'"; \
-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(usrbinPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(usrbindir)/$$f" || exit 1; \
+	   echo " $(INSTALL_PROGRAM_ENV) $(usrbinexecPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(usrbinexecdir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(usrbinexecPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(usrbinexecdir)/$$f" || exit 1; \
 	  else :; fi; \
 	done
 
-uninstall-usrbinPROGRAMS:
+uninstall-usrbinexecPROGRAMS:
 	@$(NORMAL_UNINSTALL)
-	@list='$(usrbin_PROGRAMS)'; for p in $$list; do \
+	@list='$(usrbinexec_PROGRAMS)'; for p in $$list; do \
 	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-	  echo " rm -f '$(DESTDIR)$(usrbindir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(usrbindir)/$$f"; \
+	  echo " rm -f '$(DESTDIR)$(usrbinexecdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(usrbinexecdir)/$$f"; \
 	done
 
-clean-usrbinPROGRAMS:
-	@list='$(usrbin_PROGRAMS)'; for p in $$list; do \
-	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  echo " rm -f $$p $$f"; \
-	  rm -f $$p $$f ; \
-	done
-
-installcheck-usrbinPROGRAMS: $(usrbin_PROGRAMS)
-	bad=0; pid=$$$$; list="$(usrbin_PROGRAMS)"; for p in $$list; do \
-	  case ' $(AM_INSTALLCHECK_STD_OPTIONS_EXEMPT) ' in \
-	   *" $$p "* | *" $(srcdir)/$$p "*) continue;; \
-	  esac; \
-	  f=`echo "$$p" | \
-	     sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-	  for opt in --help --version; do \
-	    if "$(DESTDIR)$(usrbindir)/$$f" $$opt >c$${pid}_.out \
-	         2>c$${pid}_.err </dev/null \
-		 && test -n "`cat c$${pid}_.out`" \
-		 && test -z "`cat c$${pid}_.err`"; then :; \
-	    else echo "$$f does not support $$opt" 1>&2; bad=1; fi; \
-	  done; \
-	done; rm -f c$${pid}_.???; exit $$bad
+clean-usrbinexecPROGRAMS:
+	-test -z "$(usrbinexec_PROGRAMS)" || rm -f $(usrbinexec_PROGRAMS)
 blockdev$(EXEEXT): $(blockdev_OBJECTS) $(blockdev_DEPENDENCIES) 
 	@rm -f blockdev$(EXEEXT)
 	$(LINK) $(blockdev_LDFLAGS) $(blockdev_OBJECTS) $(blockdev_LDADD) $(LIBS)
@@ -516,22 +445,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
 uninstall-info-am:
 install-man8: $(man8_MANS) $(man_MANS)
 	@$(NORMAL_INSTALL)
@@ -578,23 +491,6 @@ uninstall-man8:
 	  echo " rm -f '$(DESTDIR)$(man8dir)/$$inst'"; \
 	  rm -f "$(DESTDIR)$(man8dir)/$$inst"; \
 	done
-install-dist_sysconfDATA: $(dist_sysconf_DATA)
-	@$(NORMAL_INSTALL)
-	test -z "$(sysconfdir)" || $(mkdir_p) "$(DESTDIR)$(sysconfdir)"
-	@list='$(dist_sysconf_DATA)'; for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(dist_sysconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(sysconfdir)/$$f'"; \
-	  $(dist_sysconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(sysconfdir)/$$f"; \
-	done
-
-uninstall-dist_sysconfDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(dist_sysconf_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(sysconfdir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(sysconfdir)/$$f"; \
-	done
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -674,9 +570,9 @@ distdir: $(DISTFILES)
 	done
 check-am: all-am
 check: check-am
-all-am: Makefile $(PROGRAMS) $(MANS) $(DATA)
+all-am: Makefile $(PROGRAMS) $(MANS)
 installdirs:
-	for dir in "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(usrbindir)" "$(DESTDIR)$(man8dir)" "$(DESTDIR)$(sysconfdir)"; do \
+	for dir in "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(usrbinexecdir)" "$(DESTDIR)$(man8dir)"; do \
 	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
 	done
 install: install-am
@@ -705,14 +601,14 @@ maintainer-clean-generic:
 	@echo "it deletes files that may require special tools to rebuild."
 clean: clean-am
 
-clean-am: clean-generic clean-libtool clean-sbinPROGRAMS \
-	clean-usrbinPROGRAMS mostlyclean-am
+clean-am: clean-generic clean-sbinPROGRAMS clean-usrbinexecPROGRAMS \
+	mostlyclean-am
 
 distclean: distclean-am
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
@@ -724,15 +620,15 @@ info: info-am
 
 info-am:
 
-install-data-am: install-man install-usrbinPROGRAMS
+install-data-am: install-man
 
-install-exec-am: install-dist_sysconfDATA install-sbinPROGRAMS
+install-exec-am: install-sbinPROGRAMS install-usrbinexecPROGRAMS
 
 install-info: install-info-am
 
 install-man: install-man8
 
-installcheck-am: installcheck-sbinPROGRAMS installcheck-usrbinPROGRAMS
+installcheck-am:
 
 maintainer-clean: maintainer-clean-am
 	-rm -rf ./$(DEPDIR)
@@ -741,8 +637,7 @@ maintainer-clean-am: distclean-am maintainer-clean-generic
 
 mostlyclean: mostlyclean-am
 
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
+mostlyclean-am: mostlyclean-compile mostlyclean-generic
 
 pdf: pdf-am
 
@@ -752,27 +647,23 @@ ps: ps-am
 
 ps-am:
 
-uninstall-am: uninstall-dist_sysconfDATA uninstall-info-am \
-	uninstall-man uninstall-sbinPROGRAMS uninstall-usrbinPROGRAMS
+uninstall-am: uninstall-info-am uninstall-man uninstall-sbinPROGRAMS \
+	uninstall-usrbinexecPROGRAMS
 
 uninstall-man: uninstall-man8
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-sbinPROGRAMS clean-usrbinPROGRAMS ctags \
-	distclean distclean-compile distclean-generic \
-	distclean-libtool distclean-tags distdir dvi dvi-am html \
-	html-am info info-am install install-am install-data \
-	install-data-am install-dist_sysconfDATA install-exec \
-	install-exec-am install-info install-info-am install-man \
-	install-man8 install-sbinPROGRAMS install-strip \
-	install-usrbinPROGRAMS installcheck installcheck-am \
-	installcheck-sbinPROGRAMS installcheck-usrbinPROGRAMS \
-	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
-	uninstall-am uninstall-dist_sysconfDATA uninstall-info-am \
-	uninstall-man uninstall-man8 uninstall-sbinPROGRAMS \
-	uninstall-usrbinPROGRAMS
+	clean-sbinPROGRAMS clean-usrbinexecPROGRAMS ctags distclean \
+	distclean-compile distclean-generic distclean-tags distdir dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-exec install-exec-am \
+	install-info install-info-am install-man install-man8 \
+	install-sbinPROGRAMS install-strip install-usrbinexecPROGRAMS \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
+	uninstall-am uninstall-info-am uninstall-man uninstall-man8 \
+	uninstall-sbinPROGRAMS uninstall-usrbinexecPROGRAMS
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/disk-utils/blockdev.c b/disk-utils/blockdev.c
index 51033db90..c07fb30ad 100644
--- a/disk-utils/blockdev.c
+++ b/disk-utils/blockdev.c
@@ -171,7 +171,7 @@ main(int argc, char **argv) {
 
 	/* -V not together with commands */
 	if (!strcmp(argv[1], "-V") || !strcmp(argv[1], "--version")) {
-		printf("%s from %s%s\n", progname, "util-linux-", VERSION);
+		printf("%s (%s)\n", progname, PACKAGE_STRING);
 		exit(0);
 	}
 
diff --git a/disk-utils/fdformat.c b/disk-utils/fdformat.c
index 98f221525..49809fa91 100644
--- a/disk-utils/fdformat.c
+++ b/disk-utils/fdformat.c
@@ -113,7 +113,7 @@ int main(int argc,char **argv)
 
     if (argc == 2 &&
 	(!strcmp(argv[1], "-V") || !strcmp(argv[1], "--version"))) {
-	    printf(_("%s from %s%s\n"), progname, "util-linux-", VERSION);
+	    printf(_("%s (%s)\n"), progname, PACKAGE_STRING);
 	    exit(0);
     }
 
diff --git a/disk-utils/fdprm b/disk-utils/fdprm
deleted file mode 100644
index a9282e1e6..000000000
--- a/disk-utils/fdprm
+++ /dev/null
@@ -1,28 +0,0 @@
-# /etc/fdprm  -  floppy disk parameter table
-
-# Common disk formats. Names are of the form
-#  actual media capacity/maximum drive capacity
-# (Note: although 5.25" HD drives can format disks at 1.44M, they're listed
-#        as 1200 because that's the common maximum size.)
-
-#		size sec/t hds trk stre gap  rate spec1 fmt_gap
-360/360		 720     9   2  40    0 0x2A 0x02 0xDF     0x50
-1200/1200	2400    15   2  80    0 0x1B 0x00 0xDF     0x54
-360/720		 720     9   2  40    1 0x2A 0x02 0xDF     0x50
-720/720		1440     9   2  80    0 0x2A 0x02 0xDF     0x50
-720/1440	1440     9   2  80    0 0x2A 0x02 0xDF     0x50
-360/1200	 720     9   2  40    1 0x23 0x01 0xDF     0x50
-720/1200	1440     9   2  80    0 0x23 0x01 0xDF     0x50
-1440/1440	2880    18   2  80    0 0x1B 0x00 0xCF     0x6C
-
-# Non-standard disk formats:
-
-# BEWARE: They're incomplete and possibly incorrect. The only reason why
-#         they are in this file is to show how such formats are added.
-
-1440/1200	2880	18   2  80    0 ???? ???? ????	   ???? # ?????
-1680/1440	3360	21   2  80    0 0x0C 0x00 0xCF     0x6C # ?????
-
-# Add user-specific formats here
-cbm1581         1600    10   2  80    2 0x2A 0x02 0xDF     0x2E
-800/720         1600    10   2  80    0 0x2A 0x02 0xDF     0x2E
diff --git a/disk-utils/fsck.minix.c b/disk-utils/fsck.minix.c
index a38859552..4553c49a9 100644
--- a/disk-utils/fsck.minix.c
+++ b/disk-utils/fsck.minix.c
@@ -1246,7 +1246,7 @@ main(int argc, char ** argv) {
 
 	if (argc == 2 &&
 	    (!strcmp(argv[1], "-V") || !strcmp(argv[1], "--version"))) {
-		printf(_("%s from %s%s\n"), program_name, "util-linux-", VERSION);
+		printf(_("%s (%s)\n"), program_name, PACKAGE_STRING);
 		exit(0);
 	}
 
diff --git a/disk-utils/isosize.c b/disk-utils/isosize.c
index 2f98efb23..2064021fa 100644
--- a/disk-utils/isosize.c
+++ b/disk-utils/isosize.c
@@ -176,7 +176,7 @@ main(int argc, char * argv[]) {
 
 	if (argc >= 2 &&
 	    (!strcmp(argv[1], "-V") || !strcmp(argv[1], "--version"))) {
-		printf(_("%s from %s%s\n"), progname, "util-linux-", VERSION);
+		printf(_("%s (%s)\n"), progname, PACKAGE_STRING);
 		exit(0);
 	}
 
diff --git a/disk-utils/mkfs.bfs.c b/disk-utils/mkfs.bfs.c
index 224d54a34..8221f3b7e 100644
--- a/disk-utils/mkfs.bfs.c
+++ b/disk-utils/mkfs.bfs.c
@@ -116,7 +116,7 @@ main(int argc, char *argv[]) {
 
 	if (argc == 2 &&
 	    (!strcmp(argv[1], "-V") || !strcmp(argv[1], "--version"))) {
-		printf(_("%s from %s%s\n"), progname, "util-linux-", VERSION);
+		printf(_("%s (%s)\n"), progname, PACKAGE_STRING);
 		exit(0);
 	}
 
diff --git a/disk-utils/mkfs.c b/disk-utils/mkfs.c
index 4989f383e..120da0636 100644
--- a/disk-utils/mkfs.c
+++ b/disk-utils/mkfs.c
@@ -49,7 +49,7 @@ int main(int argc, char *argv[])
 
   if (argc == 2 &&
       (!strcmp(argv[1], "-V") || !strcmp(argv[1], "--version"))) {
-	  printf(_("%s from %s%s\n"), program_name, "util-linux-", VERSION);
+	  printf(_("%s (%s)\n"), program_name, PACKAGE_STRING);
 	  exit(0);
   }
 
@@ -92,7 +92,7 @@ int main(int argc, char *argv[])
   putenv(newpath);
 
   progname = (char *) malloc(sizeof(PROGNAME) + strlen(fstype) + 1);
-  if (!newpath) {
+  if (!progname) {
     fprintf(stderr, _("%s: Out of memory!\n"), "mkfs");
     exit(1);
   }
@@ -100,7 +100,7 @@ int main(int argc, char *argv[])
   argv[--optind] = progname;
 
   if (verbose) {
-    printf(_("mkfs version %s (%s)\n"), VERSION, __DATE__);
+    printf(_("mkfs (%s)\n"), PACKAGE_STRING);
     i = optind;
     while (argv[i])
       printf("%s ", argv[i++]);
diff --git a/disk-utils/mkfs.cramfs.c b/disk-utils/mkfs.cramfs.c
index 1b3e891ad..f204364ea 100644
--- a/disk-utils/mkfs.cramfs.c
+++ b/disk-utils/mkfs.cramfs.c
@@ -775,8 +775,8 @@ int main(int argc, char **argv)
 			/* old option, ignored */
 			break;
 		case 'V':
-			printf(_("%s from %s%s\n"),
-			       progname, "util-linux-", VERSION);
+			printf(_("%s (%s)\n"),
+			       progname, PACKAGE_STRING);
 			exit(0);
 		case 'v':
 			verbose = 1;
diff --git a/disk-utils/mkfs.minix.c b/disk-utils/mkfs.minix.c
index c86ed1656..92a6789a7 100644
--- a/disk-utils/mkfs.minix.c
+++ b/disk-utils/mkfs.minix.c
@@ -158,7 +158,7 @@ die(char *str) {
 
 static void
 usage(void) {
-	fprintf(stderr, "%s (%s%s)\n", program_name, "util-linux-", VERSION);
+	fprintf(stderr, "%s (%s)\n", program_name, PACKAGE_STRING);
 	fprintf(stderr,
 		_("Usage: %s [-c | -l filename] [-nXX] [-iXX] /dev/name [blocks]\n"),
 		  program_name);
@@ -623,7 +623,7 @@ main(int argc, char ** argv) {
 
   if (argc == 2 &&
       (!strcmp(argv[1], "-V") || !strcmp(argv[1], "--version"))) {
-	  printf(_("%s from %s%s\n"), program_name, "util-linux-", VERSION);
+	  printf(_("%s (%s)\n"), program_name, PACKAGE_STRING);
 	  exit(0);
   }
 
diff --git a/disk-utils/mkswap.c b/disk-utils/mkswap.c
index 3be985902..861290fed 100644
--- a/disk-utils/mkswap.c
+++ b/disk-utils/mkswap.c
@@ -519,7 +519,7 @@ main(int argc, char ** argv) {
 
 	if (argc == 2 &&
 	    (!strcmp(argv[1], "-V") || !strcmp(argv[1], "--version"))) {
-		printf(_("%s from %s%s\n"), program_name, "util-linux-", VERSION);
+		printf(_("%s (%s)\n"), program_name, PACKAGE_STRING);
 		exit(0);
 	}