Imported from util-linux-2.13-pre4 tarball.

22 files changed, 208 insertions, 149 deletions

diff --git a/Makefile.in b/Makefile.in
index 1e896d17e..b939c0baa 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -166,6 +166,8 @@ LIBS = @LIBS@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
+M68K_FALSE = @M68K_FALSE@
+M68K_TRUE = @M68K_TRUE@
 MAKEINFO = @MAKEINFO@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
diff --git a/NEWS b/NEWS
index 0b9a0ac2e..9254158b9 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,9 @@
+util-linux 2.13-pre4
+
+* don't build fdisk on m68k (Mike Frysinger)
+* misc build system and documentation fixes
+* removed program: clear
+
 util-linux 2.13-pre3
 
 * misc buld system fixes
@@ -17,7 +23,7 @@ util-linux 2.13-pre1
 * use GNU autoconf/automake/libtool for building
 * added schedutils
 * removed support for curses implementations other than ncurses
-* removed programs: arch, passwd, rescuept, setfdprm
+* removed programs: arch, passwd, rescuept, setfdprm, sln
 * removed mkminix-0.1/
 * misc fixes and documentation updates
 * new translation: vi
diff --git a/configure b/configure
index d80fc54c7..71c7da86e 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for util-linux 2.13-pre3.
+# Generated by GNU Autoconf 2.59 for util-linux 2.13-pre4.
 #
 # Report bugs to <bunk@stusta.de>.
 #
@@ -269,8 +269,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='util-linux'
 PACKAGE_TARNAME='util-linux'
-PACKAGE_VERSION='2.13-pre3'
-PACKAGE_STRING='util-linux 2.13-pre3'
+PACKAGE_VERSION='2.13-pre4'
+PACKAGE_STRING='util-linux 2.13-pre4'
 PACKAGE_BUGREPORT='bunk@stusta.de'
 
 ac_unique_file="mount/mount.c"
@@ -312,7 +312,7 @@ ac_includes_default="\
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar RANLIB ac_ct_RANLIB PERL CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP EGREP HAVE_RAW_TRUE HAVE_RAW_FALSE HAVE_UUID_TRUE HAVE_UUID_FALSE HAVE_LIBUTIL_TRUE HAVE_LIBUTIL_FALSE HAVE_TERMCAP_TRUE HAVE_TERMCAP_FALSE HAVE_BLKID_TRUE HAVE_BLKID_FALSE MKINSTALLDIRS USE_NLS MSGFMT GMSGFMT XGETTEXT MSGMERGE build build_cpu build_vendor build_os host host_cpu host_vendor host_os INTL_MACOSX_LIBS LIBICONV LTLIBICONV INTLLIBS LIBINTL LTLIBINTL POSUB HAVE_NCURSES_TRUE HAVE_NCURSES_FALSE USE_SLANG_TRUE USE_SLANG_FALSE NEED_LIBCRYPT_TRUE NEED_LIBCRYPT_FALSE HAVE_PIVOT_ROOT_TRUE HAVE_PIVOT_ROOT_FALSE INTEL_TRUE INTEL_FALSE SPARC_TRUE SPARC_FALSE BUILD_AGETTY_TRUE BUILD_AGETTY_FALSE BUILD_CRAMFS_TRUE BUILD_CRAMFS_FALSE BUILD_ELVTUNE_TRUE BUILD_ELVTUNE_FALSE BUILD_INIT_TRUE BUILD_INIT_FALSE BUILD_KILL_TRUE BUILD_KILL_FALSE BUILD_LAST_TRUE BUILD_LAST_FALSE BUILD_MESG_TRUE BUILD_MESG_FALSE BUILD_PARTX_TRUE BUILD_PARTX_FALSE BUILD_RAW_TRUE BUILD_RAW_FALSE BUILD_RDEV_TRUE BUILD_RDEV_FALSE BUILD_RENAME_TRUE BUILD_RENAME_FALSE BUILD_RESET_TRUE BUILD_RESET_FALSE BUILD_LOGIN_UTILS_TRUE BUILD_LOGIN_UTILS_FALSE HAVE_PAM_TRUE HAVE_PAM_FALSE HAVE_SELINUX_TRUE HAVE_SELINUX_FALSE BUILD_SCHEDUTILS_TRUE BUILD_SCHEDUTILS_FALSE BUILD_WALL_TRUE BUILD_WALL_FALSE BUILD_WRITE_TRUE BUILD_WRITE_FALSE USE_TTY_GROUP_TRUE USE_TTY_GROUP_FALSE LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar RANLIB ac_ct_RANLIB PERL CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP EGREP HAVE_RAW_TRUE HAVE_RAW_FALSE HAVE_UUID_TRUE HAVE_UUID_FALSE HAVE_LIBUTIL_TRUE HAVE_LIBUTIL_FALSE HAVE_TERMCAP_TRUE HAVE_TERMCAP_FALSE HAVE_BLKID_TRUE HAVE_BLKID_FALSE MKINSTALLDIRS USE_NLS MSGFMT GMSGFMT XGETTEXT MSGMERGE build build_cpu build_vendor build_os host host_cpu host_vendor host_os INTL_MACOSX_LIBS LIBICONV LTLIBICONV INTLLIBS LIBINTL LTLIBINTL POSUB HAVE_NCURSES_TRUE HAVE_NCURSES_FALSE USE_SLANG_TRUE USE_SLANG_FALSE NEED_LIBCRYPT_TRUE NEED_LIBCRYPT_FALSE HAVE_PIVOT_ROOT_TRUE HAVE_PIVOT_ROOT_FALSE INTEL_TRUE INTEL_FALSE M68K_TRUE M68K_FALSE SPARC_TRUE SPARC_FALSE BUILD_AGETTY_TRUE BUILD_AGETTY_FALSE BUILD_CRAMFS_TRUE BUILD_CRAMFS_FALSE BUILD_ELVTUNE_TRUE BUILD_ELVTUNE_FALSE BUILD_INIT_TRUE BUILD_INIT_FALSE BUILD_KILL_TRUE BUILD_KILL_FALSE BUILD_LAST_TRUE BUILD_LAST_FALSE BUILD_MESG_TRUE BUILD_MESG_FALSE BUILD_PARTX_TRUE BUILD_PARTX_FALSE BUILD_RAW_TRUE BUILD_RAW_FALSE BUILD_RDEV_TRUE BUILD_RDEV_FALSE BUILD_RENAME_TRUE BUILD_RENAME_FALSE BUILD_RESET_TRUE BUILD_RESET_FALSE BUILD_LOGIN_UTILS_TRUE BUILD_LOGIN_UTILS_FALSE HAVE_PAM_TRUE HAVE_PAM_FALSE HAVE_SELINUX_TRUE HAVE_SELINUX_FALSE BUILD_SCHEDUTILS_TRUE BUILD_SCHEDUTILS_FALSE BUILD_WALL_TRUE BUILD_WALL_FALSE BUILD_WRITE_TRUE BUILD_WRITE_FALSE USE_TTY_GROUP_TRUE USE_TTY_GROUP_FALSE LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -781,7 +781,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures util-linux 2.13-pre3 to adapt to many kinds of systems.
+\`configure' configures util-linux 2.13-pre4 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -847,7 +847,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of util-linux 2.13-pre3:";;
+     short | recursive ) echo "Configuration of util-linux 2.13-pre4:";;
    esac
   cat <<\_ACEOF
 
@@ -1007,7 +1007,7 @@ fi
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
-util-linux configure 2.13-pre3
+util-linux configure 2.13-pre4
 generated by GNU Autoconf 2.59
 
 Copyright (C) 2003 Free Software Foundation, Inc.
@@ -1021,7 +1021,7 @@ cat >&5 <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by util-linux $as_me 2.13-pre3, which was
+It was created by util-linux $as_me 2.13-pre4, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   $ $0 $@
@@ -1668,7 +1668,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='util-linux'
- VERSION='2.13-pre3'
+ VERSION='2.13-pre4'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -9545,7 +9545,8 @@ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
 case "$host" in
-  i?86-*) intel=true ;;
+  i?86-*)  intel=true ;;
+  m68*)    m68k=true ;;
   sparc*)  sparc=true ;;
 esac
 
@@ -9561,6 +9562,16 @@ fi
 
 
 
+if test x$m68k  = xtrue; then
+  M68K_TRUE=
+  M68K_FALSE='#'
+else
+  M68K_TRUE='#'
+  M68K_FALSE=
+fi
+
+
+
 if test x$sparc = xtrue; then
   SPARC_TRUE=
   SPARC_FALSE='#'
@@ -10557,6 +10568,13 @@ echo "$as_me: error: conditional \"INTEL\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
+if test -z "${M68K_TRUE}" && test -z "${M68K_FALSE}"; then
+  { { echo "$as_me:$LINENO: error: conditional \"M68K\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"M68K\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
 if test -z "${SPARC_TRUE}" && test -z "${SPARC_FALSE}"; then
   { { echo "$as_me:$LINENO: error: conditional \"SPARC\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
@@ -10968,7 +10986,7 @@ _ASBOX
 } >&5
 cat >&5 <<_CSEOF
 
-This file was extended by util-linux $as_me 2.13-pre3, which was
+This file was extended by util-linux $as_me 2.13-pre4, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -11031,7 +11049,7 @@ _ACEOF
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-util-linux config.status 2.13-pre3
+util-linux config.status 2.13-pre4
 configured by $0, generated by GNU Autoconf 2.59,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
@@ -11334,6 +11352,8 @@ s,@HAVE_PIVOT_ROOT_TRUE@,$HAVE_PIVOT_ROOT_TRUE,;t t
 s,@HAVE_PIVOT_ROOT_FALSE@,$HAVE_PIVOT_ROOT_FALSE,;t t
 s,@INTEL_TRUE@,$INTEL_TRUE,;t t
 s,@INTEL_FALSE@,$INTEL_FALSE,;t t
+s,@M68K_TRUE@,$M68K_TRUE,;t t
+s,@M68K_FALSE@,$M68K_FALSE,;t t
 s,@SPARC_TRUE@,$SPARC_TRUE,;t t
 s,@SPARC_FALSE@,$SPARC_FALSE,;t t
 s,@BUILD_AGETTY_TRUE@,$BUILD_AGETTY_TRUE,;t t
diff --git a/configure.ac b/configure.ac
index 635631ad2..269e6310c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT(util-linux, 2.13-pre3, bunk@stusta.de)
+AC_INIT(util-linux, 2.13-pre4, bunk@stusta.de)
 
 AC_PREREQ(2.59)
 
@@ -161,11 +161,13 @@ AC_TRY_COMPILE([
 
 
 case "$host" in
-  i?86-*) intel=true ;;
+  i?86-*)  intel=true ;;
+  m68*)    m68k=true ;;
   sparc*)  sparc=true ;;
 esac
 
 AM_CONDITIONAL(INTEL, test x$intel = xtrue)
+AM_CONDITIONAL(M68K,  test x$m68k  = xtrue)
 AM_CONDITIONAL(SPARC, test x$sparc = xtrue)
 
 
diff --git a/disk-utils/Makefile.in b/disk-utils/Makefile.in
index 102f3e5a3..5fcbf155c 100644
--- a/disk-utils/Makefile.in
+++ b/disk-utils/Makefile.in
@@ -216,6 +216,8 @@ LIBS = @LIBS@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
+M68K_FALSE = @M68K_FALSE@
+M68K_TRUE = @M68K_TRUE@
 MAKEINFO = @MAKEINFO@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
diff --git a/disk-utils/mkswap.8 b/disk-utils/mkswap.8
index 3463acc2a..52af99c41 100644
--- a/disk-utils/mkswap.8
+++ b/disk-utils/mkswap.8
@@ -76,9 +76,12 @@ while the bad blocks, if any, can simply be listed. Nobody wants
 to use a swap space with hundreds of bad blocks. (I would not even
 use a swap space with 1 bad block.)
 In the new style swap area this is precisely what is done.
-The maximum useful size of a swap area now depends on the architecture.
+
+The maximum useful size of a swap area depends on the architecture and
+the kernel version.
 It is roughly 2GiB on i386, PPC, m68k, ARM, 1GiB on sparc, 512MiB on mips,
-128GiB on alpha and 3TiB on sparc64.
+128GiB on alpha and 3TiB on sparc64. For kernels after 2.3.3 there is no
+such limitation.
 
 Note that before 2.1.117 the kernel allocated one byte for each page,
 while it now allocates two bytes, so that taking a swap area of 2 GiB
diff --git a/fdisk/Makefile.am b/fdisk/Makefile.am
index dd191fc9b..8fa42965a 100644
--- a/fdisk/Makefile.am
+++ b/fdisk/Makefile.am
@@ -1,5 +1,7 @@
 include $(top_srcdir)/config/include-Makefile.am
 
+if !M68K
+
 sbin_PROGRAMS = fdisk
 man_MANS = fdisk.8
 fdisk_SOURCES = fdisk.c llseek.c disksize.c fdiskbsdlabel.c fdisksgilabel.c \
@@ -25,4 +27,6 @@ cfdisk_LDADD = -lncurses
 endif
 endif
 
-endif
\ No newline at end of file
+endif
+
+endif
diff --git a/fdisk/Makefile.in b/fdisk/Makefile.in
index eef3b5eff..4f6a5f50c 100644
--- a/fdisk/Makefile.in
+++ b/fdisk/Makefile.in
@@ -38,14 +38,14 @@ build_triplet = @build@
 host_triplet = @host@
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 	$(top_srcdir)/config/include-Makefile.am
-sbin_PROGRAMS = fdisk$(EXEEXT) $(am__EXEEXT_1) $(am__EXEEXT_2) \
-	$(am__EXEEXT_3)
-@SPARC_FALSE@am__append_1 = sfdisk
-@SPARC_FALSE@am__append_2 = sfdisk.8
-@SPARC_FALSE@@USE_SLANG_TRUE@am__append_3 = cfdisk
-@SPARC_FALSE@@USE_SLANG_TRUE@am__append_4 = cfdisk.8
-@HAVE_NCURSES_TRUE@@SPARC_FALSE@@USE_SLANG_FALSE@am__append_5 = cfdisk
-@HAVE_NCURSES_TRUE@@SPARC_FALSE@@USE_SLANG_FALSE@am__append_6 = cfdisk.8
+@M68K_FALSE@sbin_PROGRAMS = fdisk$(EXEEXT) $(am__EXEEXT_1) \
+@M68K_FALSE@	$(am__EXEEXT_2) $(am__EXEEXT_3)
+@M68K_FALSE@@SPARC_FALSE@am__append_1 = sfdisk
+@M68K_FALSE@@SPARC_FALSE@am__append_2 = sfdisk.8
+@M68K_FALSE@@SPARC_FALSE@@USE_SLANG_TRUE@am__append_3 = cfdisk
+@M68K_FALSE@@SPARC_FALSE@@USE_SLANG_TRUE@am__append_4 = cfdisk.8
+@HAVE_NCURSES_TRUE@@M68K_FALSE@@SPARC_FALSE@@USE_SLANG_FALSE@am__append_5 = cfdisk
+@HAVE_NCURSES_TRUE@@M68K_FALSE@@SPARC_FALSE@@USE_SLANG_FALSE@am__append_6 = cfdisk.8
 subdir = fdisk
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
@@ -58,34 +58,42 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
-@SPARC_FALSE@am__EXEEXT_1 = sfdisk$(EXEEXT)
-@SPARC_FALSE@@USE_SLANG_TRUE@am__EXEEXT_2 = cfdisk$(EXEEXT)
-@HAVE_NCURSES_TRUE@@SPARC_FALSE@@USE_SLANG_FALSE@am__EXEEXT_3 = cfdisk$(EXEEXT)
+@M68K_FALSE@@SPARC_FALSE@am__EXEEXT_1 = sfdisk$(EXEEXT)
+@M68K_FALSE@@SPARC_FALSE@@USE_SLANG_TRUE@am__EXEEXT_2 =  \
+@M68K_FALSE@@SPARC_FALSE@@USE_SLANG_TRUE@	cfdisk$(EXEEXT)
+@HAVE_NCURSES_TRUE@@M68K_FALSE@@SPARC_FALSE@@USE_SLANG_FALSE@am__EXEEXT_3 = cfdisk$(EXEEXT)
 am__installdirs = "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(man8dir)"
 sbinPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(sbin_PROGRAMS)
 am__cfdisk_SOURCES_DIST = cfdisk.c llseek.c disksize.c \
 	i386_sys_types.c
-@HAVE_NCURSES_TRUE@@SPARC_FALSE@@USE_SLANG_FALSE@am_cfdisk_OBJECTS = cfdisk.$(OBJEXT) \
-@HAVE_NCURSES_TRUE@@SPARC_FALSE@@USE_SLANG_FALSE@	llseek.$(OBJEXT) \
-@HAVE_NCURSES_TRUE@@SPARC_FALSE@@USE_SLANG_FALSE@	disksize.$(OBJEXT) \
-@HAVE_NCURSES_TRUE@@SPARC_FALSE@@USE_SLANG_FALSE@	i386_sys_types.$(OBJEXT)
-@SPARC_FALSE@@USE_SLANG_TRUE@am_cfdisk_OBJECTS = cfdisk.$(OBJEXT) \
-@SPARC_FALSE@@USE_SLANG_TRUE@	llseek.$(OBJEXT) \
-@SPARC_FALSE@@USE_SLANG_TRUE@	disksize.$(OBJEXT) \
-@SPARC_FALSE@@USE_SLANG_TRUE@	i386_sys_types.$(OBJEXT)
+@HAVE_NCURSES_TRUE@@M68K_FALSE@@SPARC_FALSE@@USE_SLANG_FALSE@am_cfdisk_OBJECTS = cfdisk.$(OBJEXT) \
+@HAVE_NCURSES_TRUE@@M68K_FALSE@@SPARC_FALSE@@USE_SLANG_FALSE@	llseek.$(OBJEXT) \
+@HAVE_NCURSES_TRUE@@M68K_FALSE@@SPARC_FALSE@@USE_SLANG_FALSE@	disksize.$(OBJEXT) \
+@HAVE_NCURSES_TRUE@@M68K_FALSE@@SPARC_FALSE@@USE_SLANG_FALSE@	i386_sys_types.$(OBJEXT)
+@M68K_FALSE@@SPARC_FALSE@@USE_SLANG_TRUE@am_cfdisk_OBJECTS =  \
+@M68K_FALSE@@SPARC_FALSE@@USE_SLANG_TRUE@	cfdisk.$(OBJEXT) \
+@M68K_FALSE@@SPARC_FALSE@@USE_SLANG_TRUE@	llseek.$(OBJEXT) \
+@M68K_FALSE@@SPARC_FALSE@@USE_SLANG_TRUE@	disksize.$(OBJEXT) \
+@M68K_FALSE@@SPARC_FALSE@@USE_SLANG_TRUE@	i386_sys_types.$(OBJEXT)
 cfdisk_OBJECTS = $(am_cfdisk_OBJECTS)
 cfdisk_DEPENDENCIES =
-am_fdisk_OBJECTS = fdisk.$(OBJEXT) llseek.$(OBJEXT) disksize.$(OBJEXT) \
-	fdiskbsdlabel.$(OBJEXT) fdisksgilabel.$(OBJEXT) \
-	fdisksunlabel.$(OBJEXT) fdiskaixlabel.$(OBJEXT) \
-	i386_sys_types.$(OBJEXT) partname.$(OBJEXT)
+am__fdisk_SOURCES_DIST = fdisk.c llseek.c disksize.c fdiskbsdlabel.c \
+	fdisksgilabel.c fdisksunlabel.c fdiskaixlabel.c \
+	i386_sys_types.c partname.c
+@M68K_FALSE@am_fdisk_OBJECTS = fdisk.$(OBJEXT) llseek.$(OBJEXT) \
+@M68K_FALSE@	disksize.$(OBJEXT) fdiskbsdlabel.$(OBJEXT) \
+@M68K_FALSE@	fdisksgilabel.$(OBJEXT) fdisksunlabel.$(OBJEXT) \
+@M68K_FALSE@	fdiskaixlabel.$(OBJEXT) i386_sys_types.$(OBJEXT) \
+@M68K_FALSE@	partname.$(OBJEXT)
 fdisk_OBJECTS = $(am_fdisk_OBJECTS)
 fdisk_LDADD = $(LDADD)
 am__sfdisk_SOURCES_DIST = sfdisk.c disksize.c i386_sys_types.c \
 	partname.c
-@SPARC_FALSE@am_sfdisk_OBJECTS = sfdisk.$(OBJEXT) disksize.$(OBJEXT) \
-@SPARC_FALSE@	i386_sys_types.$(OBJEXT) partname.$(OBJEXT)
+@M68K_FALSE@@SPARC_FALSE@am_sfdisk_OBJECTS = sfdisk.$(OBJEXT) \
+@M68K_FALSE@@SPARC_FALSE@	disksize.$(OBJEXT) \
+@M68K_FALSE@@SPARC_FALSE@	i386_sys_types.$(OBJEXT) \
+@M68K_FALSE@@SPARC_FALSE@	partname.$(OBJEXT)
 sfdisk_OBJECTS = $(am_sfdisk_OBJECTS)
 sfdisk_LDADD = $(LDADD)
 depcomp = $(SHELL) $(top_srcdir)/config/depcomp
@@ -95,7 +103,7 @@ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 CCLD = $(CC)
 LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 SOURCES = $(cfdisk_SOURCES) $(fdisk_SOURCES) $(sfdisk_SOURCES)
-DIST_SOURCES = $(am__cfdisk_SOURCES_DIST) $(fdisk_SOURCES) \
+DIST_SOURCES = $(am__cfdisk_SOURCES_DIST) $(am__fdisk_SOURCES_DIST) \
 	$(am__sfdisk_SOURCES_DIST)
 man8dir = $(mandir)/man8
 NROFF = nroff
@@ -191,6 +199,8 @@ LIBS = @LIBS@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
+M68K_FALSE = @M68K_FALSE@
+M68K_TRUE = @M68K_TRUE@
 MAKEINFO = @MAKEINFO@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
@@ -262,15 +272,16 @@ usrbinexecdir = $(prefix)/usr/bin
 usrsbinexecdir = $(prefix)/usr/sbin
 AM_CPPFLAGS = -include $(top_srcdir)/config.h -I$(top_srcdir)/include
 DEFAULT_INCLUDES = 
-man_MANS = fdisk.8 $(am__append_2) $(am__append_4) $(am__append_6)
-fdisk_SOURCES = fdisk.c llseek.c disksize.c fdiskbsdlabel.c fdisksgilabel.c \
-	fdisksunlabel.c fdiskaixlabel.c i386_sys_types.c partname.c
-
-@SPARC_FALSE@sfdisk_SOURCES = sfdisk.c disksize.c i386_sys_types.c partname.c
-@HAVE_NCURSES_TRUE@@SPARC_FALSE@@USE_SLANG_FALSE@cfdisk_SOURCES = cfdisk.c llseek.c disksize.c i386_sys_types.c
-@SPARC_FALSE@@USE_SLANG_TRUE@cfdisk_SOURCES = cfdisk.c llseek.c disksize.c i386_sys_types.c
-@HAVE_NCURSES_TRUE@@SPARC_FALSE@@USE_SLANG_FALSE@cfdisk_LDADD = -lncurses
-@SPARC_FALSE@@USE_SLANG_TRUE@cfdisk_LDADD = -lslang
+@M68K_FALSE@man_MANS = fdisk.8 $(am__append_2) $(am__append_4) \
+@M68K_FALSE@	$(am__append_6)
+@M68K_FALSE@fdisk_SOURCES = fdisk.c llseek.c disksize.c fdiskbsdlabel.c fdisksgilabel.c \
+@M68K_FALSE@	fdisksunlabel.c fdiskaixlabel.c i386_sys_types.c partname.c
+
+@M68K_FALSE@@SPARC_FALSE@sfdisk_SOURCES = sfdisk.c disksize.c i386_sys_types.c partname.c
+@HAVE_NCURSES_TRUE@@M68K_FALSE@@SPARC_FALSE@@USE_SLANG_FALSE@cfdisk_SOURCES = cfdisk.c llseek.c disksize.c i386_sys_types.c
+@M68K_FALSE@@SPARC_FALSE@@USE_SLANG_TRUE@cfdisk_SOURCES = cfdisk.c llseek.c disksize.c i386_sys_types.c
+@HAVE_NCURSES_TRUE@@M68K_FALSE@@SPARC_FALSE@@USE_SLANG_FALSE@cfdisk_LDADD = -lncurses
+@M68K_FALSE@@SPARC_FALSE@@USE_SLANG_TRUE@cfdisk_LDADD = -lslang
 all: all-am
 
 .SUFFIXES:
diff --git a/getopt/Makefile.in b/getopt/Makefile.in
index d9d30b8fc..6521fa81e 100644
--- a/getopt/Makefile.in
+++ b/getopt/Makefile.in
@@ -169,6 +169,8 @@ LIBS = @LIBS@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
+M68K_FALSE = @M68K_FALSE@
+M68K_TRUE = @M68K_TRUE@
 MAKEINFO = @MAKEINFO@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
diff --git a/hwclock/Makefile.in b/hwclock/Makefile.in
index 653bbc367..0f01995fa 100644
--- a/hwclock/Makefile.in
+++ b/hwclock/Makefile.in
@@ -160,6 +160,8 @@ LIBS = @LIBS@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
+M68K_FALSE = @M68K_FALSE@
+M68K_TRUE = @M68K_TRUE@
 MAKEINFO = @MAKEINFO@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
diff --git a/lib/Makefile.in b/lib/Makefile.in
index 318749c39..3d70e41fa 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -166,6 +166,8 @@ LIBS = @LIBS@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
+M68K_FALSE = @M68K_FALSE@
+M68K_TRUE = @M68K_TRUE@
 MAKEINFO = @MAKEINFO@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
diff --git a/login-utils/Makefile.am b/login-utils/Makefile.am
index 01b1d65cd..9771ac29e 100644
--- a/login-utils/Makefile.am
+++ b/login-utils/Makefile.am
@@ -32,9 +32,9 @@ endif
 if BUILD_LOGIN_UTILS
 
 bin_PROGRAMS += login
-usrbinexec_PROGRAMS += chfn chsh
+usrbinexec_PROGRAMS += chfn chsh newgrp
 usrsbinexec_PROGRAMS += vipw
-man_MANS += chfn.1 chsh.1 login.1 vipw.8 vigr.8
+man_MANS += chfn.1 chsh.1 login.1 newgrp.1 vipw.8 vigr.8
 
 chfn_SOURCES = chfn.c islocal.c setpwnam.c
 chsh_SOURCES = chsh.c islocal.c setpwnam.c
@@ -46,8 +46,6 @@ newgrp_LDADD =
 vipw_LDADD =
 
 if NEED_LIBCRYPT
-usrbinexec_PROGRAMS += newgrp
-man_MANS += newgrp.1
 chfn_LDADD += -lcrypt
 chsh_LDADD += -lcrypt
 login_LDADD += -lcrypt
diff --git a/login-utils/Makefile.in b/login-utils/Makefile.in
index f883675e5..330df8014 100644
--- a/login-utils/Makefile.in
+++ b/login-utils/Makefile.in
@@ -40,9 +40,9 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 	$(top_srcdir)/config/include-Makefile.am
 bin_PROGRAMS = $(am__EXEEXT_1)
 usrbinexec_PROGRAMS = $(am__EXEEXT_4) $(am__EXEEXT_5) $(am__EXEEXT_6) \
-	$(am__EXEEXT_7) $(am__EXEEXT_8)
+	$(am__EXEEXT_7)
 sbin_PROGRAMS = $(am__EXEEXT_2) $(am__EXEEXT_3)
-usrsbinexec_PROGRAMS = $(am__EXEEXT_9)
+usrsbinexec_PROGRAMS = $(am__EXEEXT_8)
 @BUILD_AGETTY_TRUE@am__append_1 = agetty
 @BUILD_AGETTY_TRUE@am__append_2 = agetty.8
 @BUILD_INIT_TRUE@am__append_3 = simpleinit shutdown initctl
@@ -52,27 +52,25 @@ usrsbinexec_PROGRAMS = $(am__EXEEXT_9)
 @BUILD_LAST_TRUE@am__append_5 = last
 @BUILD_LAST_TRUE@am__append_6 = last.1
 @BUILD_LOGIN_UTILS_TRUE@am__append_7 = login
-@BUILD_LOGIN_UTILS_TRUE@am__append_8 = chfn chsh
+@BUILD_LOGIN_UTILS_TRUE@am__append_8 = chfn chsh newgrp
 @BUILD_LOGIN_UTILS_TRUE@am__append_9 = vipw
-@BUILD_LOGIN_UTILS_TRUE@am__append_10 = chfn.1 chsh.1 login.1 vipw.8 vigr.8
-@BUILD_LOGIN_UTILS_TRUE@@NEED_LIBCRYPT_TRUE@am__append_11 = newgrp
-@BUILD_LOGIN_UTILS_TRUE@@NEED_LIBCRYPT_TRUE@am__append_12 = newgrp.1
+@BUILD_LOGIN_UTILS_TRUE@am__append_10 = chfn.1 chsh.1 login.1 newgrp.1 vipw.8 vigr.8
+@BUILD_LOGIN_UTILS_TRUE@@NEED_LIBCRYPT_TRUE@am__append_11 = -lcrypt
+@BUILD_LOGIN_UTILS_TRUE@@NEED_LIBCRYPT_TRUE@am__append_12 = -lcrypt
 @BUILD_LOGIN_UTILS_TRUE@@NEED_LIBCRYPT_TRUE@am__append_13 = -lcrypt
 @BUILD_LOGIN_UTILS_TRUE@@NEED_LIBCRYPT_TRUE@am__append_14 = -lcrypt
-@BUILD_LOGIN_UTILS_TRUE@@NEED_LIBCRYPT_TRUE@am__append_15 = -lcrypt
-@BUILD_LOGIN_UTILS_TRUE@@NEED_LIBCRYPT_TRUE@am__append_16 = -lcrypt
+@BUILD_LOGIN_UTILS_TRUE@@HAVE_PAM_TRUE@am__append_15 = -lpam -lpam_misc
+@BUILD_LOGIN_UTILS_TRUE@@HAVE_PAM_TRUE@am__append_16 = -lpam -lpam_misc
 @BUILD_LOGIN_UTILS_TRUE@@HAVE_PAM_TRUE@am__append_17 = -lpam -lpam_misc
-@BUILD_LOGIN_UTILS_TRUE@@HAVE_PAM_TRUE@am__append_18 = -lpam -lpam_misc
-@BUILD_LOGIN_UTILS_TRUE@@HAVE_PAM_TRUE@am__append_19 = -lpam -lpam_misc
+@BUILD_LOGIN_UTILS_TRUE@@HAVE_SELINUX_TRUE@am__append_18 = selinux_utils.c
+@BUILD_LOGIN_UTILS_TRUE@@HAVE_SELINUX_TRUE@am__append_19 = -lselinux
 @BUILD_LOGIN_UTILS_TRUE@@HAVE_SELINUX_TRUE@am__append_20 = selinux_utils.c
 @BUILD_LOGIN_UTILS_TRUE@@HAVE_SELINUX_TRUE@am__append_21 = -lselinux
-@BUILD_LOGIN_UTILS_TRUE@@HAVE_SELINUX_TRUE@am__append_22 = selinux_utils.c
-@BUILD_LOGIN_UTILS_TRUE@@HAVE_SELINUX_TRUE@am__append_23 = -lselinux
-@BUILD_LOGIN_UTILS_TRUE@@HAVE_SELINUX_TRUE@am__append_24 = -lselinux
-@BUILD_MESG_TRUE@am__append_25 = mesg
-@BUILD_MESG_TRUE@am__append_26 = mesg.1
-@BUILD_WALL_TRUE@am__append_27 = wall
-@BUILD_WALL_TRUE@am__append_28 = wall.1
+@BUILD_LOGIN_UTILS_TRUE@@HAVE_SELINUX_TRUE@am__append_22 = -lselinux
+@BUILD_MESG_TRUE@am__append_23 = mesg
+@BUILD_MESG_TRUE@am__append_24 = mesg.1
+@BUILD_WALL_TRUE@am__append_25 = wall
+@BUILD_WALL_TRUE@am__append_26 = wall.1
 subdir = login-utils
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
@@ -95,13 +93,12 @@ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 @BUILD_INIT_TRUE@	initctl$(EXEEXT)
 sbinPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 @BUILD_LAST_TRUE@am__EXEEXT_4 = last$(EXEEXT)
-@BUILD_LOGIN_UTILS_TRUE@am__EXEEXT_5 = chfn$(EXEEXT) chsh$(EXEEXT)
-@BUILD_LOGIN_UTILS_TRUE@@NEED_LIBCRYPT_TRUE@am__EXEEXT_6 =  \
-@BUILD_LOGIN_UTILS_TRUE@@NEED_LIBCRYPT_TRUE@	newgrp$(EXEEXT)
-@BUILD_MESG_TRUE@am__EXEEXT_7 = mesg$(EXEEXT)
-@BUILD_WALL_TRUE@am__EXEEXT_8 = wall$(EXEEXT)
+@BUILD_LOGIN_UTILS_TRUE@am__EXEEXT_5 = chfn$(EXEEXT) chsh$(EXEEXT) \
+@BUILD_LOGIN_UTILS_TRUE@	newgrp$(EXEEXT)
+@BUILD_MESG_TRUE@am__EXEEXT_6 = mesg$(EXEEXT)
+@BUILD_WALL_TRUE@am__EXEEXT_7 = wall$(EXEEXT)
 usrbinexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
-@BUILD_LOGIN_UTILS_TRUE@am__EXEEXT_9 = vipw$(EXEEXT)
+@BUILD_LOGIN_UTILS_TRUE@am__EXEEXT_8 = vipw$(EXEEXT)
 usrsbinexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(bin_PROGRAMS) $(sbin_PROGRAMS) $(usrbinexec_PROGRAMS) \
 	$(usrsbinexec_PROGRAMS)
@@ -271,6 +268,8 @@ LIBS = @LIBS@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
+M68K_FALSE = @M68K_FALSE@
+M68K_TRUE = @M68K_TRUE@
 MAKEINFO = @MAKEINFO@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
@@ -343,21 +342,20 @@ usrsbinexecdir = $(prefix)/usr/sbin
 AM_CPPFLAGS = -include $(top_srcdir)/config.h -I$(top_srcdir)/include
 DEFAULT_INCLUDES = 
 man_MANS = $(am__append_2) $(am__append_4) $(am__append_6) \
-	$(am__append_10) $(am__append_12) $(am__append_26) \
-	$(am__append_28)
+	$(am__append_10) $(am__append_24) $(am__append_26)
 @BUILD_INIT_TRUE@@NEED_LIBCRYPT_TRUE@simpleinit_LDADD = -lcrypt
 @BUILD_LOGIN_UTILS_TRUE@chfn_SOURCES = chfn.c islocal.c setpwnam.c \
-@BUILD_LOGIN_UTILS_TRUE@	$(am__append_20)
+@BUILD_LOGIN_UTILS_TRUE@	$(am__append_18)
 @BUILD_LOGIN_UTILS_TRUE@chsh_SOURCES = chsh.c islocal.c setpwnam.c \
-@BUILD_LOGIN_UTILS_TRUE@	$(am__append_22)
-@BUILD_LOGIN_UTILS_TRUE@chfn_LDADD = ../lib/libenv.a $(am__append_13) \
-@BUILD_LOGIN_UTILS_TRUE@	$(am__append_17) $(am__append_21)
-@BUILD_LOGIN_UTILS_TRUE@chsh_LDADD = ../lib/libenv.a $(am__append_14) \
-@BUILD_LOGIN_UTILS_TRUE@	$(am__append_18) $(am__append_23)
-@BUILD_LOGIN_UTILS_TRUE@login_LDADD = ../lib/libsetproctitle.a \
+@BUILD_LOGIN_UTILS_TRUE@	$(am__append_20)
+@BUILD_LOGIN_UTILS_TRUE@chfn_LDADD = ../lib/libenv.a $(am__append_11) \
 @BUILD_LOGIN_UTILS_TRUE@	$(am__append_15) $(am__append_19)
-@BUILD_LOGIN_UTILS_TRUE@newgrp_LDADD = $(am__append_16)
-@BUILD_LOGIN_UTILS_TRUE@vipw_LDADD = $(am__append_24)
+@BUILD_LOGIN_UTILS_TRUE@chsh_LDADD = ../lib/libenv.a $(am__append_12) \
+@BUILD_LOGIN_UTILS_TRUE@	$(am__append_16) $(am__append_21)
+@BUILD_LOGIN_UTILS_TRUE@login_LDADD = ../lib/libsetproctitle.a \
+@BUILD_LOGIN_UTILS_TRUE@	$(am__append_13) $(am__append_17)
+@BUILD_LOGIN_UTILS_TRUE@newgrp_LDADD = $(am__append_14)
+@BUILD_LOGIN_UTILS_TRUE@vipw_LDADD = $(am__append_22)
 @BUILD_LOGIN_UTILS_TRUE@@HAVE_PAM_FALSE@login_SOURCES = login.c checktty.c
 @BUILD_LOGIN_UTILS_TRUE@@HAVE_PAM_TRUE@login_SOURCES = login.c
 @BUILD_WALL_TRUE@wall_SOURCES = wall.c ttymsg.c
diff --git a/misc-utils/Makefile.in b/misc-utils/Makefile.in
index 1fd78fc8a..ed9251672 100644
--- a/misc-utils/Makefile.in
+++ b/misc-utils/Makefile.in
@@ -219,6 +219,8 @@ LIBS = @LIBS@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
+M68K_FALSE = @M68K_FALSE@
+M68K_TRUE = @M68K_TRUE@
 MAKEINFO = @MAKEINFO@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
diff --git a/mount/Makefile.am b/mount/Makefile.am
index 2d00d0057..2014e2f4d 100644
--- a/mount/Makefile.am
+++ b/mount/Makefile.am
@@ -2,7 +2,8 @@ include $(top_srcdir)/config/include-Makefile.am
 
 AM_CPPFLAGS += -DHAVE_NFS
 
-bin_PROGRAMS = mount umount swapon losetup
+bin_PROGRAMS = mount umount
+sbin_PROGRAMS = losetup swapon
 man_MANS = fstab.5 nfs.5 mount.8 swapoff.8 swapon.8 umount.8 losetup.8
 
 mount_SOURCES = mount.c fstab.c sundries.c xmalloc.c realpath.c mntent.c \
@@ -32,7 +33,7 @@ swapon_LDADD = -lblkid -luuid
 endif
 
 if HAVE_PIVOT_ROOT
-bin_PROGRAMS += pivot_root
+sbin_PROGRAMS += pivot_root
 man_MANS += pivot_root.8
 endif
 
@@ -49,4 +50,4 @@ clean-local:
 install-exec-hook:
 	chmod 4755 $(DESTDIR)$(bindir)/mount
 	chmod 4755 $(DESTDIR)$(bindir)/umount
-	cd $(DESTDIR)$(bindir) && ln -sf swapon swapoff
+	cd $(DESTDIR)$(sbindir) && ln -sf swapon swapoff
diff --git a/mount/Makefile.in b/mount/Makefile.in
index 4bd27d091..b6d37894d 100644
--- a/mount/Makefile.in
+++ b/mount/Makefile.in
@@ -38,8 +38,8 @@ build_triplet = @build@
 host_triplet = @host@
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 	$(top_srcdir)/config/include-Makefile.am
-bin_PROGRAMS = mount$(EXEEXT) umount$(EXEEXT) swapon$(EXEEXT) \
-	losetup$(EXEEXT) $(am__EXEEXT_1)
+bin_PROGRAMS = mount$(EXEEXT) umount$(EXEEXT)
+sbin_PROGRAMS = losetup$(EXEEXT) swapon$(EXEEXT) $(am__EXEEXT_1)
 @HAVE_BLKID_TRUE@am__append_1 = -lblkid -luuid
 @HAVE_BLKID_TRUE@am__append_2 = -lblkid -luuid
 @HAVE_PIVOT_ROOT_TRUE@am__append_3 = pivot_root
@@ -56,11 +56,12 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
-@HAVE_PIVOT_ROOT_TRUE@am__EXEEXT_1 = pivot_root$(EXEEXT)
-am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man5dir)" \
-	"$(DESTDIR)$(man8dir)"
+am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(sbindir)" \
+	"$(DESTDIR)$(man5dir)" "$(DESTDIR)$(man8dir)"
 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
-PROGRAMS = $(bin_PROGRAMS)
+@HAVE_PIVOT_ROOT_TRUE@am__EXEEXT_1 = pivot_root$(EXEEXT)
+sbinPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+PROGRAMS = $(bin_PROGRAMS) $(sbin_PROGRAMS)
 am_losetup_OBJECTS = losetup-lomount.$(OBJEXT)
 losetup_OBJECTS = $(am_losetup_OBJECTS)
 losetup_LDADD = $(LDADD)
@@ -195,6 +196,8 @@ LIBS = @LIBS@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
+M68K_FALSE = @M68K_FALSE@
+M68K_TRUE = @M68K_TRUE@
 MAKEINFO = @MAKEINFO@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
@@ -344,6 +347,29 @@ uninstall-binPROGRAMS:
 
 clean-binPROGRAMS:
 	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
+install-sbinPROGRAMS: $(sbin_PROGRAMS)
+	@$(NORMAL_INSTALL)
+	test -z "$(sbindir)" || $(mkdir_p) "$(DESTDIR)$(sbindir)"
+	@list='$(sbin_PROGRAMS)'; for p in $$list; do \
+	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+	  if test -f $$p \
+	  ; then \
+	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+	   echo " $(INSTALL_PROGRAM_ENV) $(sbinPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(sbindir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(sbinPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(sbindir)/$$f" || exit 1; \
+	  else :; fi; \
+	done
+
+uninstall-sbinPROGRAMS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(sbin_PROGRAMS)'; for p in $$list; do \
+	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  echo " rm -f '$(DESTDIR)$(sbindir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(sbindir)/$$f"; \
+	done
+
+clean-sbinPROGRAMS:
+	-test -z "$(sbin_PROGRAMS)" || rm -f $(sbin_PROGRAMS)
 losetup$(EXEEXT): $(losetup_OBJECTS) $(losetup_DEPENDENCIES) 
 	@rm -f losetup$(EXEEXT)
 	$(LINK) $(losetup_LDFLAGS) $(losetup_OBJECTS) $(losetup_LDADD) $(LIBS)
@@ -585,7 +611,7 @@ check-am: all-am
 check: check-am
 all-am: Makefile $(PROGRAMS) $(MANS)
 installdirs:
-	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(man8dir)"; do \
+	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(man8dir)"; do \
 	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
 	done
 install: install-am
@@ -614,7 +640,8 @@ maintainer-clean-generic:
 	@echo "it deletes files that may require special tools to rebuild."
 clean: clean-am
 
-clean-am: clean-binPROGRAMS clean-generic clean-local mostlyclean-am
+clean-am: clean-binPROGRAMS clean-generic clean-local \
+	clean-sbinPROGRAMS mostlyclean-am
 
 distclean: distclean-am
 	-rm -rf ./$(DEPDIR)
@@ -634,7 +661,7 @@ info-am:
 
 install-data-am: install-man
 
-install-exec-am: install-binPROGRAMS
+install-exec-am: install-binPROGRAMS install-sbinPROGRAMS
 	@$(NORMAL_INSTALL)
 	$(MAKE) $(AM_MAKEFLAGS) install-exec-hook
 
@@ -661,22 +688,24 @@ ps: ps-am
 
 ps-am:
 
-uninstall-am: uninstall-binPROGRAMS uninstall-info-am uninstall-man
+uninstall-am: uninstall-binPROGRAMS uninstall-info-am uninstall-man \
+	uninstall-sbinPROGRAMS
 
 uninstall-man: uninstall-man5 uninstall-man8
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
-	clean-generic clean-local ctags distclean distclean-compile \
-	distclean-generic distclean-tags distdir dvi dvi-am html \
-	html-am info info-am install install-am install-binPROGRAMS \
-	install-data install-data-am install-exec install-exec-am \
-	install-exec-hook install-info install-info-am install-man \
-	install-man5 install-man8 install-strip 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-binPROGRAMS uninstall-info-am \
-	uninstall-man uninstall-man5 uninstall-man8
+	clean-generic clean-local clean-sbinPROGRAMS ctags distclean \
+	distclean-compile distclean-generic distclean-tags distdir dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-binPROGRAMS install-data install-data-am install-exec \
+	install-exec-am install-exec-hook install-info install-info-am \
+	install-man install-man5 install-man8 install-sbinPROGRAMS \
+	install-strip 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-binPROGRAMS \
+	uninstall-info-am uninstall-man uninstall-man5 uninstall-man8 \
+	uninstall-sbinPROGRAMS
 
 
 swapon.c: swapargs.h
@@ -690,7 +719,7 @@ clean-local:
 install-exec-hook:
 	chmod 4755 $(DESTDIR)$(bindir)/mount
 	chmod 4755 $(DESTDIR)$(bindir)/umount
-	cd $(DESTDIR)$(bindir) && ln -sf swapon swapoff
+	cd $(DESTDIR)$(sbindir) && ln -sf swapon swapoff
 # 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.
 .NOEXPORT:
diff --git a/partx/Makefile.in b/partx/Makefile.in
index d74f7873e..62d8c3a1c 100644
--- a/partx/Makefile.in
+++ b/partx/Makefile.in
@@ -168,6 +168,8 @@ LIBS = @LIBS@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
+M68K_FALSE = @M68K_FALSE@
+M68K_TRUE = @M68K_TRUE@
 MAKEINFO = @MAKEINFO@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
diff --git a/schedutils/Makefile.in b/schedutils/Makefile.in
index 442f670bf..ebc72dc23 100644
--- a/schedutils/Makefile.in
+++ b/schedutils/Makefile.in
@@ -166,6 +166,8 @@ LIBS = @LIBS@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
+M68K_FALSE = @M68K_FALSE@
+M68K_TRUE = @M68K_TRUE@
 MAKEINFO = @MAKEINFO@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
diff --git a/sys-utils/Makefile.in b/sys-utils/Makefile.in
index 4cf35f06b..b6130f700 100644
--- a/sys-utils/Makefile.in
+++ b/sys-utils/Makefile.in
@@ -220,6 +220,8 @@ LIBS = @LIBS@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
+M68K_FALSE = @M68K_FALSE@
+M68K_TRUE = @M68K_TRUE@
 MAKEINFO = @MAKEINFO@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
diff --git a/text-utils/Makefile.in b/text-utils/Makefile.in
index fcdc4b44e..47bc89c2e 100644
--- a/text-utils/Makefile.in
+++ b/text-utils/Makefile.in
@@ -203,6 +203,8 @@ LIBS = @LIBS@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
+M68K_FALSE = @M68K_FALSE@
+M68K_TRUE = @M68K_TRUE@
 MAKEINFO = @MAKEINFO@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
diff --git a/text-utils/clear b/text-utils/clear
deleted file mode 100755
index 73d1ebe1c..000000000
--- a/text-utils/clear
+++ /dev/null
@@ -1,2 +0,0 @@
-#! /bin/sh
-tput clear
diff --git a/text-utils/clear.1 b/text-utils/clear.1
deleted file mode 100644
index 9d2082304..000000000
--- a/text-utils/clear.1
+++ /dev/null
@@ -1,31 +0,0 @@
-.\" Copyright 1992 Rickard E. Faith (faith@cs.unc.edu)
-.\" May be distributed under the GNU General Public License
-.TH CLEAR 1 "10 October 1993" "Linux 0.99" "Linux Programmer's Manual"
-.SH NAME
-clear \- clear terminal screen
-.SH SYNOPSIS
-.BR clear
-.SH DESCRIPTION
-.B clear
-calls
-.BR tput (1)
-with the
-.I clear
-argument.  This causes
-.B tput
-to attempt to clear the screen checking the data in
-.I /etc/termcap
-(for the GNU or BSD
-.BR tput )
-or in the terminfo database
-(for the
-.B ncurses
-.BR tput )
-and sending the appropriate sequence to the terminal.  This command can be
-redirected to clear the screen of some other terminal.
-.SH "SEE ALSO"
-.BR reset (1),
-.BR stty (1),
-.BR tput (1)
-.SH AUTHOR
-Rik Faith (faith@cs.unc.edu)