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

diff --git a/uip/Makefile.in b/uip/Makefile.in
index 905c33d..54f9634 100644
--- a/uip/Makefile.in
+++ b/uip/Makefile.in
@@ -57,7 +57,7 @@ SETGID_MAIL    = @SETGID_MAIL@
 	$(COMPILE) $<
 
 # commands to build
-CMDS = ali anno burst comp dist flist folder forw mark mhbuild \
+CMDS = ali anno burst comp dist flist folder forw install-mh mark mhbuild \
        mhlist mhmail mhn mhparam mhpath mhshow mhstore msgchk \
        msh packf pick prompter refile repl rmf rmm scan send show \
        sortm whatnow whom
@@ -69,7 +69,7 @@ CMDS = ali anno burst comp dist flist folder forw mark mhbuild \
 LCMDS = flists folders next prev
 
 # misc support binaries
-MISC = ap conflict dp fmtdump install-mh mhl post rcvdist rcvpack \
+MISC = ap conflict dp fmtdump mhl post rcvdist rcvpack \
        rcvstore rcvtty slocal spost viamail mhtest
 
 # commands with 'S'pecial installation needs
@@ -251,53 +251,54 @@ whom: whom.o distsbr.o $(LOCALLIBS)
 # ========== 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)
+	$(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
-	$(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)/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 ==========
@@ -325,7 +326,7 @@ lint:
 subdir = uip
 
 Makefile: Makefile.in ../config.status
-	cd .. && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= ./config.status
+	cd .. && ./config.status $(subdir)/$@
 
 distdir = ../`cat ../distname`/$(subdir)
 nmhdist: $(DIST)