From: Sami Kerola <kerolasa@iki.fi>
Date: Sat, 11 Jun 2011 22:19:45 +0000 (+0200)
Subject: build-sys: move write to term-utils directory
X-Git-Tag: v2.20-rc1~138^2~19
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4aa9d65bfa76afd0d886ca410ae83428a490d4ea;p=thirdparty%2Futil-linux.git

build-sys: move write to term-utils directory

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
---

diff --git a/misc-utils/.gitignore b/misc-utils/.gitignore
index d6536be037..897e6d123e 100644
--- a/misc-utils/.gitignore
+++ b/misc-utils/.gitignore
@@ -10,7 +10,6 @@ rename
 script
 whereis
 kill
-write
 uuidgen
 uuidd
 findfs
diff --git a/misc-utils/Makefile.am b/misc-utils/Makefile.am
index 8fd95b8948..0644373873 100644
--- a/misc-utils/Makefile.am
+++ b/misc-utils/Makefile.am
@@ -115,18 +115,3 @@ if BUILD_RENAME
 usrbin_exec_PROGRAMS += rename
 dist_man_MANS += rename.1
 endif
-
-if BUILD_WRITE
-usrbin_exec_PROGRAMS += write
-dist_man_MANS += write.1
-write_CFLAGS = $(SUID_CFLAGS) $(AM_CFLAGS)
-write_LDFLAGS = $(SUID_LDFLAGS) $(AM_LDFLAGS)
-
-if USE_TTY_GROUP
-if MAKEINSTALL_DO_CHOWN
-install-exec-hook::
-	chgrp tty $(DESTDIR)$(usrbin_execdir)/write
-	chmod g+s $(DESTDIR)$(usrbin_execdir)/write
-endif
-endif
-endif
diff --git a/term-utils/.gitignore b/term-utils/.gitignore
index cbc5755c18..e6bb4591d7 100644
--- a/term-utils/.gitignore
+++ b/term-utils/.gitignore
@@ -4,3 +4,4 @@ script
 scriptreplay
 setterm
 wall
+write
diff --git a/term-utils/Makefile.am b/term-utils/Makefile.am
index c40d9db867..5e03560f1b 100644
--- a/term-utils/Makefile.am
+++ b/term-utils/Makefile.am
@@ -55,12 +55,20 @@ if BUILD_WALL
 usrbin_exec_PROGRAMS += wall
 wall_SOURCES = wall.c ttymsg.c ttymsg.h $(top_srcdir)/lib/strutils.c
 dist_man_MANS += wall.1
+endif
+
+if BUILD_WRITE
+usrbin_exec_PROGRAMS += write
+dist_man_MANS += write.1
+write_CFLAGS = $(SUID_CFLAGS) $(AM_CFLAGS)
+write_LDFLAGS = $(SUID_LDFLAGS) $(AM_LDFLAGS)
+endif
 
 if USE_TTY_GROUP
 if MAKEINSTALL_DO_CHOWN
 install-exec-hook::
-	chgrp tty $(DESTDIR)$(usrbin_execdir)/wall
-	chmod g+s $(DESTDIR)$(usrbin_execdir)/wall
-endif
+	chgrp tty $(DESTDIR)$(usrbin_execdir)/wall $(DESTDIR)$(usrbin_execdir)/write
+	chmod g+s $(DESTDIR)$(usrbin_execdir)/wall $(DESTDIR)$(usrbin_execdir)/write
+
 endif
 endif
diff --git a/misc-utils/write.1 b/term-utils/write.1
similarity index 100%
rename from misc-utils/write.1
rename to term-utils/write.1
diff --git a/misc-utils/write.c b/term-utils/write.c
similarity index 100%
rename from misc-utils/write.c
rename to term-utils/write.c