diff options
| -rw-r--r-- | misc-utils/.gitignore | 1 | ||||
| -rw-r--r-- | misc-utils/Makefile.am | 15 | ||||
| -rw-r--r-- | term-utils/.gitignore | 1 | ||||
| -rw-r--r-- | term-utils/Makefile.am | 14 | ||||
| -rw-r--r-- | term-utils/write.1 (renamed from misc-utils/write.1) | 0 | ||||
| -rw-r--r-- | term-utils/write.c (renamed from misc-utils/write.c) | 0 |
6 files changed, 12 insertions, 19 deletions
diff --git a/misc-utils/.gitignore b/misc-utils/.gitignore index d6536be03..897e6d123 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 8fd95b894..064437387 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 cbc5755c1..e6bb4591d 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 c40d9db86..5e03560f1 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 index 1c15f50c2..1c15f50c2 100644 --- a/misc-utils/write.1 +++ b/term-utils/write.1 diff --git a/misc-utils/write.c b/term-utils/write.c index c4f4ecc42..c4f4ecc42 100644 --- a/misc-utils/write.c +++ b/term-utils/write.c |