Fixed make_bcc_file () to use contents of From: in draft, if draft_from masquerade...

[mmh] / uip / Makefile.in

diff --git a/uip/Makefile.in b/uip/Makefile.in
index a711a92..e58ac4f 100644 (file)
--- a/uip/Makefile.in
+++ b/uip/Makefile.in
@@ -29,6 +29,7 @@ MTSLIB   = ../mts/libmts.a
 KRB4_LIBS = @KRB4_LIBS@
 SASL_LIBS = @SASL_LIBS@
 HESIOD_LIBS = @HESIOD_LIBS@
+NDBM_LIBS = @NDBM_LIBS@
 LOCALLIBS = ../config/version.o ../config/config.o $(MTSLIB) ../sbr/libmh.a
 LINKLIBS = $(LOCALLIBS) $(KRB4_LIBS) $(SASL_LIBS) $(HESIOD_LIBS) $(LIBS)
 
@@ -228,7 +229,7 @@ show: show.o mhlsbr.o termsbr.o $(LOCALLIBS)
        $(LINK) show.o mhlsbr.o termsbr.o $(LINKLIBS) $(TERMLIB)
 
 slocal: slocal.o aliasbr.o dropsbr.o $(LOCALLIBS)
-       $(LINK) slocal.o aliasbr.o dropsbr.o $(LINKLIBS)
+       $(LINK) slocal.o aliasbr.o dropsbr.o $(NDBM_LIBS) $(LINKLIBS)
 
 sortm: sortm.o $(LOCALLIBS)
        $(LINK) sortm.o $(LINKLIBS)
@@ -255,51 +256,50 @@ install: install-cmds install-misc install-lcmds install-scmds
 
 # install commands
 install-cmds:
-       $(top_srcdir)/mkinstalldirs $(bindir)
+       $(top_srcdir)/mkinstalldirs $(DESTDIR)$(bindir)
        for cmd in $(CMDS); do \
-         $(INSTALL_PROGRAM) $$cmd $(bindir)/$$cmd; \
+         $(INSTALL_PROGRAM) $$cmd $(DESTDIR)$(bindir)/$$cmd; \
        done
 
 # install links
 install-lcmds:
-       rm -f $(bindir)/flists
-       rm -f $(bindir)/folders
-       rm -f $(bindir)/prev
-       rm -f $(bindir)/next
-       rm -f $(libdir)/install-mh
-       $(LN) $(bindir)/flist  $(bindir)/flists
-       $(LN) $(bindir)/folder $(bindir)/folders
-       $(LN) $(bindir)/show   $(bindir)/prev
-       $(LN) $(bindir)/show   $(bindir)/next
-       $(LN) $(bindir)/install-mh   $(libdir)/install-mh
+       rm -f $(DESTDIR)$(bindir)/flists
+       rm -f $(DESTDIR)$(bindir)/folders
+       rm -f $(DESTDIR)$(bindir)/prev
+       rm -f $(DESTDIR)$(bindir)/next
+       rm -f $(DESTDIR)$(libdir)/install-mh
+       $(LN) $(DESTDIR)$(bindir)/flist  $(DESTDIR)$(bindir)/flists
+       $(LN) $(DESTDIR)$(bindir)/folder $(DESTDIR)$(bindir)/folders
+       $(LN) $(DESTDIR)$(bindir)/show   $(DESTDIR)$(bindir)/prev
+       $(LN) $(DESTDIR)$(bindir)/show   $(DESTDIR)$(bindir)/next
 
 # install misc support binaries
 install-misc:
-       $(top_srcdir)/mkinstalldirs $(libdir)
+       $(top_srcdir)/mkinstalldirs $(DESTDIR)$(libdir)
        for misc in $(MISC); do \
-         $(INSTALL_PROGRAM) $$misc $(libdir)/$$misc; \
+         $(INSTALL_PROGRAM) $$misc $(DESTDIR)$(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; \
+         $(INSTALL_PROGRAM) -g $(MAIL_SPOOL_GRP) -m 2755 inc $(DESTDIR)$(bindir)/$$cmd; \
        else \
-         $(INSTALL_PROGRAM)                 inc $(bindir)/$$cmd; \
+         $(INSTALL_PROGRAM)                 inc $(DESTDIR)$(bindir)/$$cmd; \
        fi
 
 uninstall:
        for cmd in $(CMDS); do \
-         rm -f $(bindir)/$$cmd; \
+         rm -f $(DESTDIR)$(bindir)/$$cmd; \
        done
        for lcmd in $(LCMDS); do \
-         rm -f $(bindir)/$$lcmd; \
+         rm -f $(DESTDIR)$(bindir)/$$lcmd; \
        done
        for misc in $(MISC); do \
-         rm -f $(libdir)/$$misc; \
+         rm -f $(DESTDIR)$(libdir)/$$misc; \
        done
        for cmd in $(SCMDS); do \
-         rm -f $(bindir)/$$cmd; \
+         rm -f $(DESTDIR)$(bindir)/$$cmd; \
        done
 
 # ========== DEPENDENCIES FOR CLEANUP ==========