From: Ondrej Oprala <ooprala@redhat.com>
Date: Tue, 8 Apr 2014 08:51:02 +0000 (+0200)
Subject: lslogins: move to login-utils
X-Git-Tag: v2.25-rc1~152
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=914e20a00a7d7236feed9be4444be9deb0b59399;p=thirdparty%2Futil-linux.git

lslogins: move to login-utils

Signed-off-by: Ondrej Oprala <ooprala@redhat.com>
---

diff --git a/login-utils/Makemodule.am b/login-utils/Makemodule.am
index 49fde45444..0275a6952c 100644
--- a/login-utils/Makemodule.am
+++ b/login-utils/Makemodule.am
@@ -207,3 +207,16 @@ endif
 if BUILD_VIPW
 	cd $(DESTDIR)$(usrsbin_execdir) && ln -sf vipw vigr
 endif
+
+if BUILD_LSLOGINS
+usrbin_exec_PROGRAMS += lslogins
+dist_man_MANS += login-utils/lslogins.1
+lslogins_SOURCES = \
+	login-utils/lslogins.c \
+	login-utils/lslogins.h
+lslogins_LDADD = $(LDADD) libcommon.la libsmartcols.la
+lslogins_CFLAGS = $(AM_CFLAGS) -I$(ul_libsmartcols_incdir)
+if HAVE_SELINUX
+lslogins_LDADD += -lselinux
+endif
+endif # BUILD_LSLOGINS
diff --git a/sys-utils/lslogins.1 b/login-utils/lslogins.1
similarity index 100%
rename from sys-utils/lslogins.1
rename to login-utils/lslogins.1
diff --git a/sys-utils/lslogins.c b/login-utils/lslogins.c
similarity index 100%
rename from sys-utils/lslogins.c
rename to login-utils/lslogins.c
diff --git a/sys-utils/Makemodule.am b/sys-utils/Makemodule.am
index 2723768f92..9d69bc60ec 100644
--- a/sys-utils/Makemodule.am
+++ b/sys-utils/Makemodule.am
@@ -334,13 +334,3 @@ dist_man_MANS += sys-utils/setpriv.1
 setpriv_SOURCES = sys-utils/setpriv.c
 setpriv_LDADD = $(LDADD) -lcap-ng libcommon.la
 endif
-
-if BUILD_LSLOGINS
-usrbin_exec_PROGRAMS += lslogins
-dist_man_MANS += sys-utils/lslogins.1
-lslogins_SOURCES = \
-	sys-utils/lslogins.c \
-	sys-utils/lslogins.h
-lslogins_LDADD = $(LDADD) libcommon.la libsmartcols.la
-lslogins_CFLAGS = $(AM_CFLAGS) -I$(ul_libsmartcols_incdir)
-endif