From b9b7473dc3c3931475d3dacbe827db62731bce4c Mon Sep 17 00:00:00 2001
From: Dan Harkless <dan@harkless.org>
Date: Tue, 17 Aug 1999 23:15:31 +0000
Subject: [PATCH] Automated #define of MAILGROUP and installation of inc as
 setgid mail when the mail spool directory isn't
 world-writable.

---
 ChangeLog       |    7 ++++++-
 uip/Makefile.in |   24 ++++++++++++++++++++----
 2 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6114a59..c1d59d8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,12 @@
+Tue Aug 17 16:06:29 1999 Dan Harkless <dan-nmh@dilvish.speed.net>
+
+	* Automated #define of MAILGROUP and installation of inc as setgid mail
+	when the mail spool directory isn't world-writable.
+
 Thu Jul 15 18:37:07 1999 Dan Harkless <dan-nmh@dilvish.speed.net>
 
 	* slocal -debug used to leave a file in /tmp for each message
-	processed.  Very bad for people have slocal -debug in their .forward!
+	processed.  Very bad for folks with slocal -debug in their .forward!
 
 	* Got rid of a ton of compilation warnings.  Most were "junk"
  	warnings due to the use of gcc -Wall (without -Wno-parentheses),
diff --git a/uip/Makefile.in b/uip/Makefile.in
index c292bd2..71fd13b 100644
--- a/uip/Makefile.in
+++ b/uip/Makefile.in
@@ -41,6 +41,8 @@ LN = ln
 INSTALL         = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 
+SETGID_MAIL = @SETGID_MAIL@
+
 .SUFFIXES:
 .SUFFIXES: .c .o
 
@@ -48,7 +50,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 	$(COMPILE) $<
 
 # commands to build
-CMDS = ali anno burst comp dist flist folder forw inc mark mhbuild \
+CMDS = ali anno burst comp dist flist folder forw mark mhbuild \
        mhlist mhmail mhn mhparam mhpath mhshow mhstore mhtest msgchk \
        msh packf pick prompter refile repl rmf rmm scan send show \
        sortm viamail whatnow whom
@@ -63,6 +65,9 @@ LCMDS = flists folders next prev
 MISC = ap conflict dp fmtdump install-mh mhl post rcvdist rcvpack \
        rcvstore rcvtty slocal spost
 
+# commands with 'S'pecial installation needs
+SCMDS = inc
+
 # source files
 SRCS = ali.c aliasbr.c anno.c annosbr.c ap.c burst.c comp.c \
        conflict.c dist.c distsbr.c dp.c dropsbr.c flist.c fmtdump.c \
@@ -84,7 +89,7 @@ DIST = $(SRCS) $(AUX)
 
 # ========== DEFAULT TARGET ==========
 
-all: $(CMDS) $(MISC)
+all: $(CMDS) $(MISC) $(SCMDS)
 
 # ========= DEPENDENCIES FOR BUILDING ==========
 
@@ -238,7 +243,7 @@ whom: whom.o distsbr.o $(LOCALLIBS)
 # ========== DEPENDENCIES FOR INSTALLING ==========
 
 # install everything
-install: install-cmds install-lcmds install-misc
+install: install-cmds install-lcmds install-misc install-scmds
 
 # install commands
 install-cmds:
@@ -265,6 +270,14 @@ install-misc:
 	  $(INSTALL_PROGRAM) $$misc $(libdir)/$$misc; \
 	done
 
+# install commands with special installation needs (thus no $(SCMDS) use here)
+install-scmds:
+	if test x$(SETGID_MAIL) = x1; then \
+	  $(INSTALL_PROGRAM) -g mail -m 2755 inc $(bindir)/$$cmd; \
+	else \
+	  $(INSTALL_PROGRAM)                 inc $(bindir)/$$cmd; \
+	fi
+
 uninstall:
 	for cmd in $(CMDS); do \
 	  rm -f $(bindir)/$$cmd; \
@@ -275,6 +288,9 @@ uninstall:
 	for misc in $(MISC); do \
 	  rm -f $(libdir)/$$misc; \
 	done
+	for cmd in $(SCMDS); do \
+	  rm -f $(bindir)/$$cmd; \
+	done
 
 # ========== DEPENDENCIES FOR CLEANUP ==========
 
@@ -282,7 +298,7 @@ mostlyclean:
 	rm -f *.o *~
 
 clean: mostlyclean
-	rm -f $(CMDS) $(MISC)
+	rm -f $(CMDS) $(MISC) $(SCMDS)
 
 distclean: clean
 	rm -f Makefile
-- 
1.7.10.4