diff options
| author | Karel Zak | 2012-05-30 17:29:01 +0200 |
|---|---|---|
| committer | Karel Zak | 2012-06-26 20:48:22 +0200 |
| commit | 434b07a09062f5c06b1e1ab01a6751ab69947bbb (patch) | |
| tree | b17fd11a534d2763eba1dae14c0a5e8cf82ded44 /sys-utils | |
| parent | mount: (old) remove mtab lock test (diff) | |
| download | kernel-qcow2-util-linux-434b07a09062f5c06b1e1ab01a6751ab69947bbb.tar.gz kernel-qcow2-util-linux-434b07a09062f5c06b1e1ab01a6751ab69947bbb.tar.xz kernel-qcow2-util-linux-434b07a09062f5c06b1e1ab01a6751ab69947bbb.zip | |
build-sys: default to new sys-utils/mount.c, add --enable-deprecated-mount
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'sys-utils')
| -rw-r--r-- | sys-utils/Makefile.am | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sys-utils/Makefile.am b/sys-utils/Makefile.am index c19be4ceb..6e5aefcae 100644 --- a/sys-utils/Makefile.am +++ b/sys-utils/Makefile.am @@ -90,13 +90,13 @@ prlimit_SOURCES = \ endif -if BUILD_NEW_MOUNT +if BUILD_MOUNT # -# The original (stable) mount is in mount/ directory +# The original mount is in mount/ directory # -- temporary we share some man pages # bin_PROGRAMS += mount umount -dist_man_MANS += mount.8 ../mount/umount.8 +dist_man_MANS += mount.8 ../deprecated-mount/umount.8 mount_SOURCES = \ mount.c \ @@ -128,7 +128,7 @@ umount_static_CFLAGS = $(umount_CFLAGS) umount_static_LDFLAGS = $(umount_LDFLAGS) -all-static umount_static_LDADD = $(umount_LDADD) endif -endif # BUILD_NEW_MOUNT +endif # BUILD_MOUNT if BUILD_SWAPON @@ -266,7 +266,7 @@ install-exec-hook: if BUILD_SWAPON cd $(DESTDIR)$(sbindir) && ln -sf swapon swapoff endif -if BUILD_NEW_MOUNT +if BUILD_MOUNT if MAKEINSTALL_DO_SETUID chmod 4755 $(DESTDIR)$(bindir)/mount chmod 4755 $(DESTDIR)$(bindir)/umount |