mhsign: Fix key lookup of aliases when encrypting

[mmh] / uip / Makefile.in

diff --git a/uip/Makefile.in b/uip/Makefile.in
index f0c258e..6b7a570 100644 (file)
--- a/uip/Makefile.in
+++ b/uip/Makefile.in
@@ -17,11 +17,12 @@ etcdir      = @sysconfdir@
 CC       = @CC@
 CFLAGS   = @CFLAGS@
 DEFS     = @DEFS@
-INCLUDES = -I$(srcdir) -I$(top_srcdir) @CPPFLAGS@
+# add include dir .. for config.h when building in different directory
+INCLUDES = -I$(srcdir) -I$(top_srcdir) -I.. @CPPFLAGS@
 LDFLAGS  = @LDFLAGS@
 
 LIBS     = @LIBS@
-LOCALLIBS = ../config/version.o ../config/config.o ../sbr/libmh.a
+LOCALLIBS = ../sbr/libmh.a
 LINKLIBS = $(LOCALLIBS) $(LIBS)
 
 LINT    = @LINT@
@@ -48,7 +49,7 @@ SETGID_MAIL    = @SETGID_MAIL@
 
 # commands to build
 CMDS = ali anno burst comp dist flist folder forw mmh mark \
-       mhbuild mhl \
+       mhbuild mhl mhsign mhpgp \
        mhlist mhmail mhparam mhpath mhstore new packf pick \
        print-mimetype prompter rcvdist rcvpack rcvstore refile repl rmf \
        rmm scan send sendfiles show slocal sortm spost whatnow whom
@@ -66,7 +67,7 @@ SCMDS = inc
 SRCS = ali.c aliasbr.c anno.c ap.c burst.c comp.c \
        dist.c distsbr.c dp.c dropsbr.c flist.c fmtdump.c \
        folder.c forw.c inc.c mark.c mmh.sh mmhwrap.sh mhbuild.c \
-       mhfree.c mhl.c mhlist.c mhlistsbr.c \
+       mhfree.c mhl.c mhlist.c mhlistsbr.c mhsign.sh mhpgp.sh \
        mhmail.c mhmisc.c mhoutsbr.c mhparam.c mhparse.c \
        mhpath.c mhshow.c mhshowsbr.c mhstore.c mhtest.c \
        new.c packf.c pick.c print-mimetype.sh \
@@ -75,12 +76,6 @@ SRCS = ali.c aliasbr.c anno.c ap.c burst.c comp.c \
        sendfiles.sh slocal.c sortm.c spost.c termsbr.c \
        whatnow.c whatnowproc.c whom.c
 
-# auxiliary files
-AUX = Makefile.in
-
-# all files in this directory included in the distribution
-DIST = $(SRCS) $(AUX)
-
 # ========== DEFAULT TARGET ==========
 
 all: $(CMDS) $(MISC) $(SCMDS)
@@ -134,6 +129,14 @@ mmhwrap: mmhwrap.sh
        sed "s,%bindir%,"$(bindir)"," $(srcdir)/mmhwrap.sh >mmhwrap
        chmod +x mmhwrap
 
+mhsign: mhsign.sh
+       sed "s,%libdir%,"$(libdir)"," $(srcdir)/mhsign.sh >mhsign
+       chmod +x mhsign
+
+mhpgp: mhpgp.sh
+       cp $(srcdir)/mhpgp.sh mhpgp
+       chmod +x mhpgp
+
 mhbuild: mhbuild.o mhoutsbr.o mhmisc.o mhfree.o mhparse.o termsbr.o $(LOCALLIBS)
        $(LINK) mhbuild.o mhoutsbr.o mhmisc.o mhfree.o mhparse.o $(LINKLIBS) $(TERMLIB)
 
@@ -308,10 +311,3 @@ subdir = uip
 Makefile: Makefile.in ../config.status
        cd .. && ./config.status $(subdir)/$@
 
-distdir = ../`cat ../distname`/$(subdir)
-mmhdist: $(DIST)
-       @echo "Copying distribution files in $(subdir)"
-       @for file in $(DIST); do \
-         cp -p $(srcdir)/$$file $(distdir); \
-       done
-