From: Karel Zak <kzak@redhat.com>
Date: Wed, 2 Mar 2011 13:02:01 +0000 (+0100)
Subject: build-sys: move setterm to term-utils/
X-Git-Tag: v2.20-rc1~498
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8c59914ee2124569329952b1b492a6c14b4fc1ad;p=thirdparty%2Futil-linux.git

build-sys: move setterm to term-utils/

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

diff --git a/misc-utils/Makefile.am b/misc-utils/Makefile.am
index f588317659..d239024de8 100644
--- a/misc-utils/Makefile.am
+++ b/misc-utils/Makefile.am
@@ -106,18 +106,6 @@ if HAVE_UTEMPTER
 script_LDADD += -lutempter
 endif
 
-if HAVE_NCURSES
-if LINUX
-usrbin_exec_PROGRAMS += setterm
-dist_man_MANS += setterm.1
-endif
-if HAVE_TINFO
-setterm_LDADD = -ltinfo
-else
-setterm_LDADD = @NCURSES_LIBS@
-endif
-endif
-
 if BUILD_KILL
 bin_PROGRAMS += kill
 kill_SOURCES = kill.c procs.c kill.h $(top_srcdir)/lib/strutils.c
diff --git a/term-utils/Makefile.am b/term-utils/Makefile.am
index a7459a0f22..94d377b79b 100644
--- a/term-utils/Makefile.am
+++ b/term-utils/Makefile.am
@@ -16,3 +16,16 @@ if !HAVE_LANGINFO
 agetty_SOURCES += $(top_srcdir)/lib/langinfo.c
 endif
 endif
+
+if HAVE_NCURSES
+if LINUX
+usrbin_exec_PROGRAMS += setterm
+dist_man_MANS += setterm.1
+endif
+if HAVE_TINFO
+setterm_LDADD = -ltinfo
+else
+setterm_LDADD = @NCURSES_LIBS@
+endif
+endif
+
diff --git a/misc-utils/setterm.1 b/term-utils/setterm.1
similarity index 100%
rename from misc-utils/setterm.1
rename to term-utils/setterm.1
diff --git a/misc-utils/setterm.c b/term-utils/setterm.c
similarity index 100%
rename from misc-utils/setterm.c
rename to term-utils/setterm.c