From: Karel Zak <kzak@redhat.com>
Date: Thu, 5 Apr 2012 13:39:44 +0000 (+0200)
Subject: eject: use BUILD_EJECT, move to sys-utils
X-Git-Tag: v2.22-rc1~555^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=88a3f049ec48b59eb9373d342e52759c1f9261ec;p=thirdparty%2Futil-linux.git

eject: use BUILD_EJECT, move to sys-utils

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

diff --git a/configure.ac b/configure.ac
index 4e9b5f4ee9..18ed3fe0c6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -868,6 +868,7 @@ AC_ARG_ENABLE([eject],
 )
 UL_BUILD_INIT([eject])
 UL_REQUIRES_LINUX([eject])
+AM_CONDITIONAL(BUILD_EJECT, test "x$build_eject" = xyes)
 
 
 AC_ARG_ENABLE([agetty],
@@ -878,8 +879,6 @@ UL_BUILD_INIT([agetty])
 AM_CONDITIONAL(BUILD_AGETTY, test "x$build_agetty" = xyes)
 
 
-
-
 AC_ARG_ENABLE([cramfs],
   AS_HELP_STRING([--disable-cramfs], [do not build fsck.cramfs, mkfs.cramfs]),
   [], enable_cramfs=check
diff --git a/misc-utils/.gitignore b/misc-utils/.gitignore
index aeefb6ef73..927af23260 100644
--- a/misc-utils/.gitignore
+++ b/misc-utils/.gitignore
@@ -18,4 +18,3 @@ wipefs
 findmnt
 lsblk
 lslocks
-eject
diff --git a/misc-utils/Makefile.am b/misc-utils/Makefile.am
index 1ba1827b17..acf2c9d1ae 100644
--- a/misc-utils/Makefile.am
+++ b/misc-utils/Makefile.am
@@ -32,16 +32,6 @@ dist_man_MANS = \
 
 namei_SOURCES = namei.c $(top_srcdir)/lib/strutils.c
 
-usrbin_exec_PROGRAMS += eject
-eject_SOURCES =  \
-	eject.c \
-	$(top_srcdir)/lib/strutils.c \
-	$(top_srcdir)/lib/sysfs.c \
-	$(top_srcdir)/lib/at.c
-eject_LDADD = $(ul_libmount_la)
-eject_CFLAGS = $(AM_CFLAGS) -I$(ul_libmount_incdir)
-dist_man_MANS += eject.1
-
 if BUILD_DDATE
 usrbin_exec_PROGRAMS += ddate
 dist_man_MANS += ddate.1
diff --git a/sys-utils/.gitignore b/sys-utils/.gitignore
index 38e8874b3f..a5bf223c1b 100644
--- a/sys-utils/.gitignore
+++ b/sys-utils/.gitignore
@@ -2,6 +2,7 @@ arch
 ctrlaltdel
 cytune
 dmesg
+eject
 fallocate
 flock
 fsfreeze
diff --git a/sys-utils/Makefile.am b/sys-utils/Makefile.am
index 83f38cf90b..828c48d9b3 100644
--- a/sys-utils/Makefile.am
+++ b/sys-utils/Makefile.am
@@ -43,6 +43,19 @@ dist_man_MANS += \
 endif # LINUX
 
 
+if BUILD_EJECT
+usrbin_exec_PROGRAMS += eject
+eject_SOURCES =  \
+	eject.c \
+	$(top_srcdir)/lib/strutils.c \
+	$(top_srcdir)/lib/sysfs.c \
+	$(top_srcdir)/lib/at.c
+eject_LDADD = $(ul_libmount_la)
+eject_CFLAGS = $(AM_CFLAGS) -I$(ul_libmount_incdir)
+dist_man_MANS += eject.1
+endif
+
+
 if BUILD_LOSETUP
 sbin_PROGRAMS += losetup
 dist_man_MANS += losetup.8
diff --git a/misc-utils/eject.1 b/sys-utils/eject.1
similarity index 100%
rename from misc-utils/eject.1
rename to sys-utils/eject.1
diff --git a/misc-utils/eject.c b/sys-utils/eject.c
similarity index 100%
rename from misc-utils/eject.c
rename to sys-utils/eject.c