X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2FMakefile.in;h=a562ad29b9684007ac1eb346e4da4ed453c5effc;hb=refs%2Ftags%2Fkim-before-sasl;hp=c292bd20213a624c79ce05e9a4bac73840bacec5;hpb=1691e80890e5d8ba258c51c214a3e91880e1db2b;p=mmh

diff --git a/uip/Makefile.in b/uip/Makefile.in
index c292bd2..a562ad2 100644
--- a/uip/Makefile.in
+++ b/uip/Makefile.in
@@ -24,15 +24,19 @@ INCLUDES = -I.. -I$(srcdir) -I$(top_srcdir) $(HESIOD_INCLUDES)
 LDFLAGS  = @LDFLAGS@
 
 LIBS     = @LIBS@
-MTSLIB   = @MTSLIB@
+MTSLIB   = ../mts/smtp/libsmtp.a
 KRB4_LIBS = @KRB4_LIBS@
 HESIOD_LIBS = @HESIOD_LIBS@
-LOCALLIBS = ../config/version.o ../config/config.o ../sbr/libmh.a ../$(MTSLIB) ../zotnet/libzot.a
+LOCALLIBS = ../config/version.o ../config/config.o ../sbr/libmh.a $(MTSLIB) ../zotnet/libzot.a
 LINKLIBS = $(LOCALLIBS) $(KRB4_LIBS) $(HESIOD_LIBS) $(LIBS)
 
+LINT	= @LINT@
+LINTFLAGS = @LINTFLAGS@
+
 TERMLIB = @TERMLIB@
 LEXLIB  = @LEXLIB@
-POPLIB  = @POPLIB@
+APOPLIB = @APOPLIB@
+POPLIB  = @POPLIB@ $(APOPLIB)
 
 COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CFLAGS)
 LINK    = $(CC) $(LDFLAGS) -o $@
@@ -41,6 +45,9 @@ LN = ln
 INSTALL         = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 
+MAIL_SPOOL_GRP = @MAIL_SPOOL_GRP@
+SETGID_MAIL    = @SETGID_MAIL@
+
 .SUFFIXES:
 .SUFFIXES: .c .o
 
@@ -48,10 +55,10 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 	$(COMPILE) $<
 
 # commands to build
-CMDS = ali anno burst comp dist flist folder forw inc mark mhbuild \
-       mhlist mhmail mhn mhparam mhpath mhshow mhstore mhtest msgchk \
+CMDS = ali anno burst comp dist flist folder forw mark mhbuild \
+       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
@@ -61,7 +68,10 @@ 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
 
 # source files
 SRCS = ali.c aliasbr.c anno.c annosbr.c ap.c burst.c comp.c \
@@ -70,7 +80,7 @@ SRCS = ali.c aliasbr.c anno.c annosbr.c ap.c burst.c comp.c \
        mhbuildsbr.c mhcachesbr.c mhfree.c mhl.c mhlist.c mhlistsbr.c mhlsbr.c \
        mhmail.c mhmisc.c mhn.c mhoutsbr.c mhparam.c mhparse.c mhpath.c mhshow.c \
        mhshowsbr.c mhstore.c mhstoresbr.c mhtest.c msgchk.c msh.c mshcmds.c packf.c \
-       pick.c picksbr.c popi.c popsbr.c post.c prompter.c rcvdist.c rcvpack.c \
+       pick.c picksbr.c popsbr.c post.c prompter.c rcvdist.c rcvpack.c \
        rcvstore.c rcvtty.c refile.c repl.c replsbr.c rmf.c rmm.c scan.c \
        scansbr.c send.c sendsbr.c show.c slocal.c sortm.c spost.c \
        termsbr.c viamail.c vmh.c vmhsbr.c vmhtest.c whatnow.c whatnowproc.c \
@@ -84,7 +94,7 @@ DIST = $(SRCS) $(AUX)
 
 # ========== DEFAULT TARGET ==========
 
-all: $(CMDS) $(MISC)
+all: $(CMDS) $(MISC) $(SCMDS)
 
 # ========= DEPENDENCIES FOR BUILDING ==========
 
@@ -238,7 +248,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 +275,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) != x; then \
+	  $(INSTALL_PROGRAM) -g $(MAIL_SPOOL_GRP) -m 2755 inc $(bindir)/$$cmd; \
+	else \
+	  $(INSTALL_PROGRAM)                 inc $(bindir)/$$cmd; \
+	fi
+
 uninstall:
 	for cmd in $(CMDS); do \
 	  rm -f $(bindir)/$$cmd; \
@@ -275,6 +293,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 +303,7 @@ mostlyclean:
 	rm -f *.o *~
 
 clean: mostlyclean
-	rm -f $(CMDS) $(MISC)
+	rm -f $(CMDS) $(MISC) $(SCMDS)
 
 distclean: clean
 	rm -f Makefile
@@ -291,6 +312,11 @@ realclean: distclean
 
 superclean: realclean
 
+# ========== DEPENDENCIES FOR LINT  ================
+
+lint: 
+	$(LINT) $(LINTFLAGS) $(INCLUDES) $(DEFS) $(SRCS)
+
 # ========== DEPENDENCIES FOR MAINTENANCE ==========
 
 subdir = uip