slocal: use mhetcdir instead of NMHETCDIR.

[mmh] / uip / Makefile.in

diff --git a/uip/Makefile.in b/uip/Makefile.in
index 403147f..d81985f 100644 (file)
--- a/uip/Makefile.in
+++ b/uip/Makefile.in
@@ -17,7 +17,6 @@ etcdir      = @sysconfdir@
 CC       = @CC@
 CFLAGS   = @CFLAGS@
 DEFS     = @DEFS@
-CONFIGDEFS = -DNMHETCDIR='"$(etcdir)"'
 INCLUDES = -I.. -I$(srcdir) -I$(top_srcdir) @CPPFLAGS@
 LDFLAGS  = @LDFLAGS@
 
@@ -32,7 +31,6 @@ TERMLIB = @TERMLIB@
 LEXLIB  = @LEXLIB@
 
 COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CFLAGS)
-COMPILE2 = $(CC) -c $(DEFS) $(CONFIGDEFS) $(INCLUDES) $(CFLAGS)
 LINK    = $(CC) $(LDFLAGS) -o $@
 LN = ln
 
@@ -49,17 +47,17 @@ SETGID_MAIL    = @SETGID_MAIL@
        $(COMPILE) $<
 
 # commands to build
-CMDS = ali anno burst comp dist flist folder forw mmh mark mhbuild mhl \
-       mhlist mhmail mhparam mhpath mhshow mhstore msgchk \
-       new packf pick prompter refile repl rmf rmm scan send sendfiles show \
-       sortm whatnow
+CMDS = ali anno burst comp conflict dist flist folder forw mmh mark \
+       mhbuild mhl \
+       mhlist mhmail mhparam mhpath mhshow mhstore msgchk new packf pick \
+       print-mimetype prompter rcvdist rcvpack rcvstore refile repl rmf \
+       rmm scan send sendfiles show slocal sortm spost whatnow
 
 # commands that are links to other commands
-LCMDS = flists folders next prev
+LCMDS = flists folders next prev fnext fprev unseen
 
 # misc support binaries
-MISC = ap conflict dp fmtdump rcvdist rcvpack \
-       rcvstore slocal spost mhtest
+MISC = ap dp fmtdump mhtest
 
 # commands with 'S'pecial installation needs
 SCMDS = inc
@@ -71,7 +69,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 \
        mhmail.c mhmisc.c mhoutsbr.c mhparam.c mhparse.c \
        mhpath.c mhshow.c mhshowsbr.c mhstore.c mhstoresbr.c mhtest.c \
-       msgchk.c new.c packf.c pick.c picksbr.c \
+       msgchk.c new.c packf.c pick.c print-mimetype.sh \
        prompter.c rcvdist.c rcvpack.c rcvstore.c \
        refile.c repl.c rmf.c rmm.c scan.c scansbr.c send.c \
        sendfiles.sh show.c slocal.c sortm.c spost.c termsbr.c \
@@ -92,8 +90,8 @@ all: $(CMDS) $(MISC) $(SCMDS)
 ali: ali.o aliasbr.o $(LOCALLIBS)
        $(LINK) ali.o aliasbr.o $(LINKLIBS)
 
-ap: ap.o termsbr.o $(LOCALLIBS)
-       $(LINK) ap.o termsbr.o $(LINKLIBS) $(TERMLIB)
+ap: ap.o $(LOCALLIBS)
+       $(LINK) ap.o $(LINKLIBS)
 
 anno: anno.o annosbr.o $(LOCALLIBS)
        $(LINK) anno.o annosbr.o $(LINKLIBS)
@@ -110,8 +108,8 @@ conflict: conflict.o aliasbr.o $(LOCALLIBS)
 dist: dist.o whatnowproc.o $(LOCALLIBS)
        $(LINK) dist.o whatnowproc.o $(LINKLIBS)
 
-dp: dp.o termsbr.o $(LOCALLIBS)
-       $(LINK) dp.o termsbr.o $(LINKLIBS) $(TERMLIB)
+dp: dp.o $(LOCALLIBS)
+       $(LINK) dp.o $(LINKLIBS)
 
 flist: flist.o $(LOCALLIBS)
        $(LINK) flist.o $(LINKLIBS)
@@ -125,8 +123,8 @@ folder: folder.o $(LOCALLIBS)
 forw: forw.o whatnowproc.o annosbr.o $(LOCALLIBS)
        $(LINK) forw.o whatnowproc.o annosbr.o $(LINKLIBS)
 
-inc: inc.o scansbr.o dropsbr.o termsbr.o $(LOCALLIBS)
-       $(LINK) inc.o scansbr.o dropsbr.o termsbr.o $(LINKLIBS) $(TERMLIB)
+inc: inc.o scansbr.o termsbr.o $(LOCALLIBS)
+       $(LINK) inc.o scansbr.o termsbr.o $(LINKLIBS) $(TERMLIB)
 
 mmh: mmh.sh
        cp mmh.sh mmh
@@ -171,8 +169,12 @@ new: new.o $(LOCALLIBS)
 packf: packf.o dropsbr.o $(LOCALLIBS)
        $(LINK) packf.o dropsbr.o $(LINKLIBS)
 
-pick: pick.o picksbr.o $(LOCALLIBS)
-       $(LINK) pick.o picksbr.o $(LINKLIBS)
+pick: pick.o $(LOCALLIBS)
+       $(LINK) pick.o $(LINKLIBS)
+
+print-mimetype: print-mimetype.sh
+       cp print-mimetype.sh print-mimetype
+       chmod +x print-mimetype
 
 prompter: prompter.o $(LOCALLIBS)
        $(LINK) prompter.o $(LINKLIBS)
@@ -211,11 +213,8 @@ sendfiles: sendfiles.sh
 show: show.o $(LOCALLIBS)
        $(LINK) show.o $(LINKLIBS)
 
-slocal.o: slocal.c
-       $(COMPILE2) $(srcdir)/slocal.c
-
-slocal: slocal.o aliasbr.o dropsbr.o $(LOCALLIBS)
-       $(LINK) slocal.o aliasbr.o dropsbr.o $(LINKLIBS)
+slocal: slocal.o $(LOCALLIBS)
+       $(LINK) slocal.o $(LINKLIBS)
 
 sortm: sortm.o $(LOCALLIBS)
        $(LINK) sortm.o $(LINKLIBS)
@@ -233,7 +232,7 @@ install: install-cmds install-misc install-lcmds install-scmds
 
 # install commands
 install-cmds:
-       $(top_srcdir)/mkinstalldirs $(DESTDIR)$(bindir)
+       mkdir -p $(DESTDIR)$(bindir)
        for cmd in $(CMDS); do \
          $(INSTALL_PROGRAM) $$cmd $(DESTDIR)$(bindir)/$$cmd; \
        done
@@ -257,7 +256,7 @@ install-lcmds:
 
 # install misc support binaries
 install-misc:
-       $(top_srcdir)/mkinstalldirs $(DESTDIR)$(libdir)
+       mkdir -p $(DESTDIR)$(libdir)
        for misc in $(MISC); do \
          $(INSTALL_PROGRAM) $$misc $(DESTDIR)$(libdir)/$$misc; \
        done
@@ -312,7 +311,7 @@ Makefile: Makefile.in ../config.status
        cd .. && ./config.status $(subdir)/$@
 
 distdir = ../`cat ../distname`/$(subdir)
-nmhdist: $(DIST)
+mmhdist: $(DIST)
        @echo "Copying distribution files in $(subdir)"
        @for file in $(DIST); do \
          cp -p $(srcdir)/$$file $(distdir); \