X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2FMakefile.in;h=e7e7b46d6979752354089c139b93958c5144095f;hp=905c33dce8a487071df5b431f67fd708e54d812a;hb=6e9577f324bef90765a5edc02044eb111ec48072;hpb=c0374b7556d4b53d2032eae55395311e307d3d16

diff --git a/uip/Makefile.in b/uip/Makefile.in
index 905c33d..e7e7b46 100644
--- a/uip/Makefile.in
+++ b/uip/Makefile.in
@@ -1,8 +1,6 @@
 #
 # Makefile for uip subdirectory
 #
-# $Id$
-#
 
 SHELL = /bin/sh
 
@@ -10,6 +8,8 @@ top_srcdir = @top_srcdir@
 srcdir     = @srcdir@
 VPATH      = @srcdir@
 
+VERSION = `$(top_srcdir)/version.sh $(top_srcdir)`
+
 prefix      = @prefix@
 exec_prefix = @exec_prefix@
 bindir      = @bindir@
@@ -19,28 +19,21 @@ etcdir      = @sysconfdir@
 CC       = @CC@
 CFLAGS   = @CFLAGS@
 DEFS     = @DEFS@
-HESIOD_INCLUDES = @HESIOD_INCLUDES@
-SASL_INCLUDES = @SASL_INCLUDES@
-INCLUDES = -I.. -I$(srcdir) -I$(top_srcdir) $(HESIOD_INCLUDES) $(SASL_INCLUDES)
+# add include dir .. for config.h when building in different directory
+INCLUDES = -I$(srcdir) -I$(top_srcdir) -I.. @CPPFLAGS@
 LDFLAGS  = @LDFLAGS@
 
 LIBS     = @LIBS@
-MTSLIB   = ../mts/libmts.a
-KRB4_LIBS = @KRB4_LIBS@
-SASL_LIBS = @SASL_LIBS@
-HESIOD_LIBS = @HESIOD_LIBS@
-LOCALLIBS = ../config/version.o ../config/config.o $(MTSLIB) ../sbr/libmh.a
-LINKLIBS = $(LOCALLIBS) $(KRB4_LIBS) $(SASL_LIBS) $(HESIOD_LIBS) $(LIBS)
-
-LINT	= @LINT@
+LOCALLIBS = ../sbr/libmh.a
+LINKLIBS = $(LOCALLIBS) $(LIBS)
+
+LINT    = @LINT@
 LINTFLAGS = @LINTFLAGS@
 
 TERMLIB = @TERMLIB@
 LEXLIB  = @LEXLIB@
-APOPLIB = @APOPLIB@
-POPLIB  = @POPLIB@ $(APOPLIB)
 
-COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CFLAGS)
+COMPILE = $(CC) -c $(DEFS) -DVERSION="\"$(VERSION)\"" $(INCLUDES) $(CFLAGS)
 LINK    = $(CC) $(LDFLAGS) -o $@
 LN = ln
 
@@ -57,43 +50,33 @@ SETGID_MAIL    = @SETGID_MAIL@
 	$(COMPILE) $<
 
 # commands to build
-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 whatnow whom
-
-## removed this from CMDS until I can fix it
-## OTHERCMDS = vmh
+CMDS = ali anno burst comp dist flist folder forw mmh mark \
+       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
 
 # 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 install-mh mhl post rcvdist rcvpack \
-       rcvstore rcvtty slocal spost viamail mhtest
+MISC = ap dp fmtdump mhtest mmhwrap whatnow2
 
 # 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		  \
-	conflict.c dist.c distsbr.c dp.c dropsbr.c flist.c fmtdump.c	  \
-	folder.c forw.c ftpsbr.c inc.c install-mh.c mark.c md5.c mhbuild.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 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 whatnowsbr.c	  \
-	whom.c wmh.c
-
-# auxiliary files
-AUX = Makefile.in
-
-# all files in this directory included in the distribution
-DIST = $(SRCS) $(AUX)
+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 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 \
+	prompter.c rcvdist.c rcvpack.c rcvstore.c \
+	refile.c repl.c rmf.c rmm.c scan.c scansbr.c send.c \
+	sendfiles.sh slocal.c sortm.c spost.c termsbr.c \
+	whatnow.c whatnowproc.c whom.c whatnow2.sh
 
 # ========== DEFAULT TARGET ==========
 
@@ -104,26 +87,23 @@ 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)
+anno: anno.o $(LOCALLIBS)
+	$(LINK) anno.o $(LINKLIBS)
 
 burst: burst.o $(LOCALLIBS)
 	$(LINK) burst.o $(LINKLIBS)
 
-comp: comp.o whatnowproc.o whatnowsbr.o sendsbr.o annosbr.o distsbr.o $(LOCALLIBS)
-	$(LINK) comp.o whatnowproc.o whatnowsbr.o sendsbr.o annosbr.o distsbr.o $(LINKLIBS)
+comp: comp.o whatnowproc.o $(LOCALLIBS)
+	$(LINK) comp.o whatnowproc.o $(LINKLIBS)
 
-conflict: conflict.o aliasbr.o $(LOCALLIBS)
-	$(LINK) conflict.o aliasbr.o $(LINKLIBS)
+dist: dist.o whatnowproc.o $(LOCALLIBS)
+	$(LINK) dist.o whatnowproc.o $(LINKLIBS)
 
-dist: dist.o whatnowproc.o whatnowsbr.o sendsbr.o annosbr.o distsbr.o $(LOCALLIBS)
-	$(LINK) dist.o whatnowproc.o whatnowsbr.o sendsbr.o annosbr.o distsbr.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)
@@ -134,62 +114,70 @@ fmtdump: fmtdump.o $(LOCALLIBS)
 folder: folder.o $(LOCALLIBS)
 	$(LINK) folder.o $(LINKLIBS)
 
-forw: forw.o whatnowproc.o whatnowsbr.o sendsbr.o annosbr.o distsbr.o $(LOCALLIBS)
-	$(LINK) forw.o whatnowproc.o whatnowsbr.o sendsbr.o annosbr.o distsbr.o $(LINKLIBS)
-
-inc: inc.o scansbr.o dropsbr.o termsbr.o $(POPLIB) $(LOCALLIBS)
-	$(LINK) inc.o scansbr.o dropsbr.o termsbr.o $(POPLIB) $(LINKLIBS) $(TERMLIB)
+forw: forw.o whatnowproc.o $(LOCALLIBS)
+	$(LINK) forw.o whatnowproc.o $(LINKLIBS)
 
-install-mh: install-mh.o $(LOCALLIBS)
-	$(LINK) install-mh.o $(LINKLIBS)
+inc: inc.o scansbr.o termsbr.o $(LOCALLIBS)
+	$(LINK) inc.o scansbr.o termsbr.o $(LINKLIBS) $(TERMLIB)
 
 mark: mark.o $(LOCALLIBS)
 	$(LINK) mark.o $(LINKLIBS)
 
-mhbuild: mhbuild.o mhbuildsbr.o mhcachesbr.o mhlistsbr.o mhoutsbr.o mhmisc.o mhfree.o ftpsbr.o termsbr.o md5.o $(LOCALLIBS)
-	$(LINK) mhbuild.o mhbuildsbr.o mhcachesbr.o mhlistsbr.o mhoutsbr.o mhmisc.o mhfree.o ftpsbr.o md5.o $(LINKLIBS) $(TERMLIB)
+mmh: mmh.sh
+	cp $(srcdir)/mmh.sh mmh
+	chmod +x mmh
+
+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
 
-mhl: mhl.o mhlsbr.o termsbr.o $(LOCALLIBS)
-	$(LINK) mhl.o mhlsbr.o termsbr.o $(LINKLIBS) $(TERMLIB)
+mhpgp: mhpgp.sh
+	cp $(srcdir)/mhpgp.sh mhpgp
+	chmod +x mhpgp
 
-mhlist: mhlist.o mhparse.o mhcachesbr.o mhlistsbr.o mhmisc.o mhfree.o ftpsbr.o termsbr.o md5.o $(LOCALLIBS)
-	$(LINK) mhlist.o mhparse.o mhcachesbr.o mhlistsbr.o mhmisc.o mhfree.o ftpsbr.o termsbr.o md5.o $(LINKLIBS) $(TERMLIB)
+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)
+
+mhl: mhl.o termsbr.o $(LOCALLIBS)
+	$(LINK) mhl.o termsbr.o $(LINKLIBS) $(TERMLIB)
+
+mhlist: mhlist.o mhparse.o mhlistsbr.o mhmisc.o mhfree.o termsbr.o $(LOCALLIBS)
+	$(LINK) mhlist.o mhparse.o mhlistsbr.o mhmisc.o mhfree.o termsbr.o $(LINKLIBS) $(TERMLIB)
 
 mhmail: mhmail.o $(LOCALLIBS)
 	$(LINK) mhmail.o $(LINKLIBS)
 
-mhn: mhn.o mhparse.o mhcachesbr.o mhshowsbr.o mhlistsbr.o mhstoresbr.o mhmisc.o mhfree.o ftpsbr.o termsbr.o md5.o $(LOCALLIBS)
-	$(LINK) mhn.o mhparse.o mhcachesbr.o mhshowsbr.o mhlistsbr.o mhstoresbr.o mhmisc.o mhfree.o ftpsbr.o termsbr.o md5.o $(LINKLIBS) $(TERMLIB)
-
 mhparam: mhparam.o $(LOCALLIBS)
 	$(LINK) mhparam.o $(LINKLIBS)
 
 mhpath: mhpath.o $(LOCALLIBS)
 	$(LINK) mhpath.o $(LINKLIBS)
 
-mhshow: mhshow.o mhparse.o mhcachesbr.o mhshowsbr.o mhlistsbr.o mhmisc.o mhfree.o ftpsbr.o termsbr.o md5.o $(LOCALLIBS)
-	$(LINK) mhshow.o mhparse.o mhcachesbr.o mhshowsbr.o mhlistsbr.o mhmisc.o mhfree.o ftpsbr.o termsbr.o md5.o $(LINKLIBS) $(TERMLIB)
-
-mhstore: mhstore.o mhparse.o mhcachesbr.o mhshowsbr.o mhlistsbr.o mhstoresbr.o mhmisc.o mhfree.o ftpsbr.o termsbr.o md5.o $(LOCALLIBS)
-	$(LINK) mhstore.o mhparse.o mhcachesbr.o mhshowsbr.o mhlistsbr.o mhstoresbr.o mhmisc.o mhfree.o ftpsbr.o termsbr.o md5.o $(LINKLIBS) $(TERMLIB)
+show: mhshow.o mhparse.o mhshowsbr.o mhlistsbr.o mhmisc.o mhfree.o termsbr.o $(LOCALLIBS)
+	$(LINK) mhshow.o mhparse.o mhshowsbr.o mhlistsbr.o mhmisc.o mhfree.o termsbr.o $(LINKLIBS) $(TERMLIB)
 
-mhtest: mhtest.o mhparse.o mhcachesbr.o mhoutsbr.o mhmisc.o mhfree.o ftpsbr.o termsbr.o md5.o $(LOCALLIBS)
-	$(LINK) mhtest.o mhparse.o mhcachesbr.o mhoutsbr.o mhmisc.o mhfree.o ftpsbr.o termsbr.o md5.o $(LINKLIBS) $(TERMLIB)
+mhstore: mhstore.o mhparse.o mhshowsbr.o mhlistsbr.o mhmisc.o mhfree.o termsbr.o $(LOCALLIBS)
+	$(LINK) mhstore.o mhparse.o mhshowsbr.o mhlistsbr.o mhmisc.o mhfree.o termsbr.o $(LINKLIBS) $(TERMLIB)
 
-msgchk: msgchk.o $(POPLIB) $(LOCALLIBS)
-	$(LINK) msgchk.o $(POPLIB) $(LINKLIBS)
+mhtest: mhtest.o mhparse.o mhoutsbr.o mhmisc.o mhfree.o termsbr.o $(LOCALLIBS)
+	$(LINK) mhtest.o mhparse.o mhoutsbr.o mhmisc.o mhfree.o termsbr.o $(LINKLIBS) $(TERMLIB)
 
-msh: msh.o mshcmds.o vmhsbr.o picksbr.o scansbr.o dropsbr.o mhlsbr.o termsbr.o $(LOCALLIBS)
-	$(LINK) msh.o mshcmds.o vmhsbr.o picksbr.o scansbr.o dropsbr.o mhlsbr.o termsbr.o $(LINKLIBS) $(TERMLIB)
+new: new.o $(LOCALLIBS)
+	$(LINK) new.o $(LINKLIBS)
 
 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)
 
-post: post.o aliasbr.o $(LOCALLIBS)
-	$(LINK) post.o aliasbr.o $(LINKLIBS)
+print-mimetype: print-mimetype.sh
+	cp $(srcdir)/print-mimetype.sh print-mimetype
+	chmod +x print-mimetype
 
 prompter: prompter.o $(LOCALLIBS)
 	$(LINK) prompter.o $(LINKLIBS)
@@ -203,14 +191,11 @@ rcvpack: rcvpack.o dropsbr.o $(LOCALLIBS)
 rcvstore: rcvstore.o $(LOCALLIBS)
 	$(LINK) rcvstore.o $(LINKLIBS)
 
-rcvtty: rcvtty.o scansbr.o termsbr.o $(LOCALLIBS)
-	$(LINK) rcvtty.o scansbr.o termsbr.o $(LINKLIBS) $(TERMLIB)
-
 refile: refile.o $(LOCALLIBS)
 	$(LINK) refile.o $(LINKLIBS)
 
-repl: repl.o replsbr.o whatnowproc.o whatnowsbr.o sendsbr.o annosbr.o distsbr.o $(LOCALLIBS)
-	$(LINK) repl.o replsbr.o whatnowproc.o whatnowsbr.o sendsbr.o annosbr.o distsbr.o $(LINKLIBS)
+repl: repl.o whatnowproc.o $(LOCALLIBS)
+	$(LINK) repl.o whatnowproc.o $(LINKLIBS)
 
 rmf: rmf.o $(LOCALLIBS)
 	$(LINK) rmf.o $(LINKLIBS)
@@ -221,14 +206,15 @@ rmm: rmm.o $(LOCALLIBS)
 scan: scan.o scansbr.o termsbr.o $(LOCALLIBS)
 	$(LINK) scan.o scansbr.o termsbr.o $(LINKLIBS) $(TERMLIB)
 
-send: send.o sendsbr.o annosbr.o distsbr.o $(LOCALLIBS)
-	$(LINK) send.o sendsbr.o annosbr.o distsbr.o $(LINKLIBS)
+send: send.o distsbr.o $(LOCALLIBS)
+	$(LINK) send.o distsbr.o $(LINKLIBS)
 
-show: show.o mhlsbr.o termsbr.o $(LOCALLIBS)
-	$(LINK) show.o mhlsbr.o termsbr.o $(LINKLIBS) $(TERMLIB)
+sendfiles: sendfiles.sh
+	cp $(srcdir)/sendfiles.sh sendfiles
+	chmod +x sendfiles
 
-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)
@@ -236,68 +222,71 @@ sortm: sortm.o $(LOCALLIBS)
 spost: spost.o aliasbr.o $(LOCALLIBS)
 	$(LINK) spost.o aliasbr.o $(LINKLIBS)
 
-viamail: viamail.o mhmisc.o mhoutsbr.o sendsbr.o annosbr.o distsbr.o $(LOCALLIBS)
-	$(LINK) viamail.o mhmisc.o mhoutsbr.o sendsbr.o annosbr.o distsbr.o $(LINKLIBS) $(TERMLIB)
-
-vmh: vmh.o vmhsbr.o $(LOCALLIBS)
-	$(LINK) vmh.o vmhsbr.o $(LINKLIBS) $(TERMLIB)
+whatnow: whatnow.o $(LOCALLIBS)
+	$(LINK) whatnow.o $(LINKLIBS)
 
-whatnow: whatnow.o whatnowsbr.o sendsbr.o annosbr.o distsbr.o $(LOCALLIBS)
-	$(LINK) whatnow.o whatnowsbr.o sendsbr.o annosbr.o distsbr.o $(LINKLIBS)
+whatnow2: whatnow2.sh
+	cp $(srcdir)/whatnow2.sh whatnow2
 
-whom: whom.o distsbr.o $(LOCALLIBS)
-	$(LINK) whom.o distsbr.o $(LINKLIBS)
+whom: whom.o $(LOCALLIBS)
+	$(LINK) whom.o $(LINKLIBS)
 
 # ========== DEPENDENCIES FOR INSTALLING ==========
 
 # install everything
-install: install-cmds install-lcmds install-misc install-scmds
+install: install-cmds install-misc install-lcmds install-scmds
 
 # install commands
 install-cmds:
-	$(top_srcdir)/mkinstalldirs $(bindir)
+	mkdir -p $(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
-	$(LN) $(bindir)/flist  $(bindir)/flists
-	$(LN) $(bindir)/folder $(bindir)/folders
-	$(LN) $(bindir)/show   $(bindir)/prev
-	$(LN) $(bindir)/show   $(bindir)/next
+	rm -f $(DESTDIR)$(bindir)/flists
+	rm -f $(DESTDIR)$(bindir)/folders
+	rm -f $(DESTDIR)$(bindir)/fnext
+	rm -f $(DESTDIR)$(bindir)/fprev
+	rm -f $(DESTDIR)$(bindir)/unseen
+	rm -f $(DESTDIR)$(bindir)/prev
+	rm -f $(DESTDIR)$(bindir)/next
+	$(LN) $(DESTDIR)$(bindir)/flist  $(DESTDIR)$(bindir)/flists
+	$(LN) $(DESTDIR)$(bindir)/folder $(DESTDIR)$(bindir)/folders
+	$(LN) $(DESTDIR)$(bindir)/new    $(DESTDIR)$(bindir)/fnext
+	$(LN) $(DESTDIR)$(bindir)/new    $(DESTDIR)$(bindir)/fprev
+	$(LN) $(DESTDIR)$(bindir)/new    $(DESTDIR)$(bindir)/unseen
+	$(LN) $(DESTDIR)$(bindir)/show   $(DESTDIR)$(bindir)/prev
+	$(LN) $(DESTDIR)$(bindir)/show   $(DESTDIR)$(bindir)/next
 
 # install misc support binaries
 install-misc:
-	$(top_srcdir)/mkinstalldirs $(libdir)
+	mkdir -p $(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 ==========
@@ -317,7 +306,7 @@ superclean: realclean
 
 # ========== DEPENDENCIES FOR LINT  ================
 
-lint: 
+lint:
 	$(LINT) $(LINTFLAGS) $(INCLUDES) $(DEFS) $(SRCS)
 
 # ========== DEPENDENCIES FOR MAINTENANCE ==========
@@ -325,12 +314,5 @@ lint:
 subdir = uip
 
 Makefile: Makefile.in ../config.status
-	cd .. && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= ./config.status
-
-distdir = ../`cat ../distname`/$(subdir)
-nmhdist: $(DIST)
-	@echo "Copying distribution files in $(subdir)"
-	@for file in $(DIST); do \
-	  cp -p $(srcdir)/$$file $(distdir); \
-	done
+	cd .. && ./config.status $(subdir)/$@