X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2FMakefile.in;h=0b50f290339d6df5be67aa2e1e4cbf481c5d2a29;hb=3e2e8b43581f31be0cabe123dade6ff146dd31c7;hp=a2ecd08b04b25d23b1ca23f8ad17ec71fdf81b5b;hpb=045b9601403a216c400642229f2b291f85f88f7d;p=mmh

diff --git a/uip/Makefile.in b/uip/Makefile.in
index a2ecd08..0b50f29 100644
--- a/uip/Makefile.in
+++ b/uip/Makefile.in
@@ -32,7 +32,8 @@ LINKLIBS = $(LOCALLIBS) $(KRB4_LIBS) $(HESIOD_LIBS) $(LIBS)
 
 TERMLIB = @TERMLIB@
 LEXLIB  = @LEXLIB@
-POPLIB  = @POPLIB@
+APOPLIB = @APOPLIB@
+POPLIB  = @POPLIB@ $(APOPLIB)
 
 COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CFLAGS)
 LINK    = $(CC) $(LDFLAGS) -o $@
@@ -41,8 +42,8 @@ LN = ln
 INSTALL         = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 
-SETGID_MAIL = @SETGID_MAIL@
-MAILGROUP   = @MAILGROUP@
+MAIL_SPOOL_GRP = @MAIL_SPOOL_GRP@
+SETGID_MAIL    = @SETGID_MAIL@
 
 .SUFFIXES:
 .SUFFIXES: .c .o
@@ -52,9 +53,9 @@ MAILGROUP   = @MAILGROUP@
 
 # commands to build
 CMDS = ali anno burst comp dist flist folder forw mark mhbuild \
-       mhlist mhmail mhn mhparam mhpath mhshow mhstore mhtest msgchk \
+       mhlist mhmail mhn mhparam mhpath mhshow mhstore msgchk \
        msh packf pick prompter refile repl rmf rmm scan send show \
-       sortm viamail whatnow whom
+       sortm whatnow whom
 
 ## removed this from CMDS until I can fix it
 ## OTHERCMDS = vmh
@@ -64,7 +65,7 @@ LCMDS = flists folders next prev
 
 # misc support binaries
 MISC = ap conflict dp fmtdump install-mh mhl post rcvdist rcvpack \
-       rcvstore rcvtty slocal spost
+       rcvstore rcvtty slocal spost viamail mhtest
 
 # commands with 'S'pecial installation needs
 SCMDS = inc
@@ -273,8 +274,8 @@ install-misc:
 
 # install commands with special installation needs (thus no $(SCMDS) use here)
 install-scmds:
-	if test x$(SETGID_MAIL) = x1; then \
-	  $(INSTALL_PROGRAM) -g $(MAILGROUP) -m 2755 inc $(bindir)/$$cmd; \
+	if test x$(SETGID_MAIL) != x; then \
+	  $(INSTALL_PROGRAM) -g $(MAIL_SPOOL_GRP) -m 2755 inc $(bindir)/$$cmd; \
 	else \
 	  $(INSTALL_PROGRAM)                 inc $(bindir)/$$cmd; \
 	fi