SF patch #683906, add $DESTDIR to install target, by Ademar de Souza Reis

Jr, after much checking and rechecking (and some massaging) by me. Checking
in now before I fall asleep and forget what all this was for.

This patch adds the ability to 'make DESTDIR=/some/dir/tree install' that
doesn't influence the paths stored in e.g. Defaults.py at all, which is of
good use for various package managers. It is not all that package managers
must do, however! Running make install with DESTDIR set means bin/update is
never run, and mm_cfg.py is always written; package managers should make
sure the appropriate post-installation is done, and that mm_cfg.py is
treated as a config file.

This patch inadvertently fixes some bogus whitespace: 8-spaces where
surrounding code used tabs. The difference was harmless because the 8-spaces
were used inside shell-continued-oneliners, but it is confusing and could
lead to future harm. I'm too tired to make those two or three changes in a
separate checkin, sorry.

This patch also assumes the various packages that are installed using
distutils do not record (or rather, use) their installation paths anywhere,
but this seems to hold true at least for the moment.

Also, I've done so many slow cvs diff's, I'm wondering when we'll switch to
Subversion. Unfortunately, I've also done so many 'cvs diff -c > file; patch
-p0 -R < file's to switch back and forth between patches and change sets,
I'm wondering when we'll switch to Aegis as well. :-P

10 files changed, 25 insertions, 15 deletions

diff --git a/Mailman/Archiver/Makefile.in b/Mailman/Archiver/Makefile.in
index fe56149dc..f7216f01f 100644
--- a/Mailman/Archiver/Makefile.in
+++ b/Mailman/Archiver/Makefile.in
@@ -25,6 +25,7 @@ srcdir= 	@srcdir@
 bindir= 	@bindir@
 prefix=   	@prefix@
 exec_prefix=	@exec_prefix@
+DESTDIR=
 
 CC=		@CC@
 CHMOD=  	@CHMOD@
@@ -59,7 +60,7 @@ all:
 install: 
 	for f in $(MODULES); \
 	do \
-	    $(INSTALL) -m $(FILEMODE) $(srcdir)/$$f $(PACKAGEDIR); \
+	    $(INSTALL) -m $(FILEMODE) $(srcdir)/$$f $(DESTDIR)$(PACKAGEDIR); \
 	done
 
 finish:
diff --git a/Mailman/Bouncers/Makefile.in b/Mailman/Bouncers/Makefile.in
index d4c9dfcae..ac30de90c 100644
--- a/Mailman/Bouncers/Makefile.in
+++ b/Mailman/Bouncers/Makefile.in
@@ -25,6 +25,7 @@ srcdir= 	@srcdir@
 bindir= 	@bindir@
 prefix=   	@prefix@
 exec_prefix=	@exec_prefix@
+DESTDIR=
 
 CC=		@CC@
 CHMOD=  	@CHMOD@
@@ -57,7 +58,7 @@ all:
 install: 
 	for f in $(MODULES); \
 	do \
-	    $(INSTALL) -m $(FILEMODE) $(srcdir)/$$f $(PACKAGEDIR); \
+	    $(INSTALL) -m $(FILEMODE) $(srcdir)/$$f $(DESTDIR)$(PACKAGEDIR); \
 	done
 
 finish:
diff --git a/Mailman/Cgi/Makefile.in b/Mailman/Cgi/Makefile.in
index a613c2b0a..68aa08869 100644
--- a/Mailman/Cgi/Makefile.in
+++ b/Mailman/Cgi/Makefile.in
@@ -25,6 +25,7 @@ srcdir= 	@srcdir@
 bindir= 	@bindir@
 prefix=   	@prefix@
 exec_prefix=	@exec_prefix@
+DESTDIR=
 
 CC=		@CC@
 CHMOD=  	@CHMOD@
@@ -59,7 +60,7 @@ all:
 install:
 	for f in $(CGI_MODULES); \
 	do \
-	    $(INSTALL) -m $(FILEMODE) $(srcdir)/$$f $(CGIDIR); \
+	    $(INSTALL) -m $(FILEMODE) $(srcdir)/$$f $(DESTDIR)$(CGIDIR); \
         done
 
 finish:
diff --git a/Mailman/Commands/Makefile.in b/Mailman/Commands/Makefile.in
index bacd96291..20e539f8e 100644
--- a/Mailman/Commands/Makefile.in
+++ b/Mailman/Commands/Makefile.in
@@ -25,6 +25,7 @@ srcdir= 	@srcdir@
 bindir= 	@bindir@
 prefix=   	@prefix@
 exec_prefix=	@exec_prefix@
+DESTDIR=
 
 CC=		@CC@
 CHMOD=  	@CHMOD@
@@ -57,7 +58,7 @@ all:
 install: 
 	for f in $(MODULES); \
 	do \
-	    $(INSTALL) -m $(FILEMODE) $(srcdir)/$$f $(PACKAGEDIR); \
+	    $(INSTALL) -m $(FILEMODE) $(srcdir)/$$f $(DESTDIR)$(PACKAGEDIR); \
 	done
 
 finish:
diff --git a/Mailman/Gui/Makefile.in b/Mailman/Gui/Makefile.in
index ea219772a..b0bbfe800 100644
--- a/Mailman/Gui/Makefile.in
+++ b/Mailman/Gui/Makefile.in
@@ -25,6 +25,7 @@ srcdir= 	@srcdir@
 bindir= 	@bindir@
 prefix=   	@prefix@
 exec_prefix=	@exec_prefix@
+DESTDIR=
 
 CC=		@CC@
 CHMOD=  	@CHMOD@
@@ -57,7 +58,7 @@ all:
 install: 
 	for f in $(MODULES); \
 	do \
-	    $(INSTALL) -m $(FILEMODE) $(srcdir)/$$f $(PACKAGEDIR); \
+	    $(INSTALL) -m $(FILEMODE) $(srcdir)/$$f $(DESTDIR)$(PACKAGEDIR); \
 	done
 
 finish:
diff --git a/Mailman/Handlers/Makefile.in b/Mailman/Handlers/Makefile.in
index 6123bdfbe..5aef340f7 100644
--- a/Mailman/Handlers/Makefile.in
+++ b/Mailman/Handlers/Makefile.in
@@ -25,6 +25,7 @@ srcdir= 	@srcdir@
 bindir= 	@bindir@
 prefix=   	@prefix@
 exec_prefix=	@exec_prefix@
+DESTDIR=
 
 CC=		@CC@
 CHMOD=  	@CHMOD@
@@ -57,7 +58,7 @@ all:
 install: 
 	for f in $(MODULES); \
 	do \
-	    $(INSTALL) -m $(FILEMODE) $(srcdir)/$$f $(PACKAGEDIR); \
+	    $(INSTALL) -m $(FILEMODE) $(srcdir)/$$f $(DESTDIR)$(PACKAGEDIR); \
 	done
 
 finish:
diff --git a/Mailman/Logging/Makefile.in b/Mailman/Logging/Makefile.in
index 407f39a9c..18bc3f3bd 100644
--- a/Mailman/Logging/Makefile.in
+++ b/Mailman/Logging/Makefile.in
@@ -25,6 +25,7 @@ srcdir= 	@srcdir@
 bindir= 	@bindir@
 prefix=   	@prefix@
 exec_prefix=	@exec_prefix@
+DESTDIR=
 
 CC=		@CC@
 CHMOD=  	@CHMOD@
@@ -57,7 +58,7 @@ all:
 install: 
 	for f in $(MODULES); \
 	do \
-	    $(INSTALL) -m $(FILEMODE) $(srcdir)/$$f $(PACKAGEDIR); \
+	    $(INSTALL) -m $(FILEMODE) $(srcdir)/$$f $(DESTDIR)$(PACKAGEDIR); \
 	done
 
 finish:
diff --git a/Mailman/MTA/Makefile.in b/Mailman/MTA/Makefile.in
index 42a6fcc5e..03b044bc9 100644
--- a/Mailman/MTA/Makefile.in
+++ b/Mailman/MTA/Makefile.in
@@ -25,6 +25,7 @@ srcdir= 	@srcdir@
 bindir= 	@bindir@
 prefix=   	@prefix@
 exec_prefix=	@exec_prefix@
+DESTDIR=
 
 CC=		@CC@
 CHMOD=  	@CHMOD@
@@ -57,7 +58,7 @@ all:
 install: 
 	for f in $(MODULES); \
 	do \
-	    $(INSTALL) -m $(FILEMODE) $(srcdir)/$$f $(PACKAGEDIR); \
+	    $(INSTALL) -m $(FILEMODE) $(srcdir)/$$f $(DESTDIR)$(PACKAGEDIR); \
 	done
 
 finish:
diff --git a/Mailman/Makefile.in b/Mailman/Makefile.in
index d6fec07b8..af3edfe62 100644
--- a/Mailman/Makefile.in
+++ b/Mailman/Makefile.in
@@ -27,6 +27,7 @@ srcdir= 	@srcdir@
 bindir= 	@bindir@
 prefix=   	@prefix@
 exec_prefix=	@exec_prefix@
+DESTDIR=
 
 CC=		@CC@
 CHMOD=  	@CHMOD@
@@ -64,24 +65,24 @@ all:
 install-here: 
 	for f in $(MODULES); \
 	do \
-	    $(INSTALL) -m $(FILEMODE) $$f $(PACKAGEDIR); \
+	    $(INSTALL) -m $(FILEMODE) $$f $(DESTDIR)$(PACKAGEDIR); \
 	done
-	$(INSTALL) -m $(FILEMODE) mm_cfg.py.dist $(PACKAGEDIR)
-	if [ ! -f $(PACKAGEDIR)/mm_cfg.py ]; \
+	$(INSTALL) -m $(FILEMODE) mm_cfg.py.dist $(DESTDIR)$(PACKAGEDIR)
+	if [ ! -f $(DESTDIR)$(PACKAGEDIR)/mm_cfg.py ]; \
 	then \
-	    $(INSTALL) -m $(FILEMODE) mm_cfg.py.dist $(PACKAGEDIR)/mm_cfg.py; \
+	    $(INSTALL) -m $(FILEMODE) mm_cfg.py.dist $(DESTDIR)$(PACKAGEDIR)/mm_cfg.py; \
 	fi
 
 install: install-here
 	for d in $(SUBDIRS); \
 	do \
-	    (cd $$d; $(MAKE) install); \
+	    (cd $$d; $(MAKE) DESTDIR=$(DESTDIR) install); \
 	done
 
 finish:
 	@for d in $(SUBDIRS); \
 	do \
-	    (cd $$d; $(MAKE) finish); \
+	    (cd $$d; $(MAKE) DESTDIR=$(DESTDIR) finish); \
 	done
 
 clean:
diff --git a/Mailman/Queue/Makefile.in b/Mailman/Queue/Makefile.in
index a92ae67df..965697e10 100644
--- a/Mailman/Queue/Makefile.in
+++ b/Mailman/Queue/Makefile.in
@@ -25,6 +25,7 @@ srcdir= 	@srcdir@
 bindir= 	@bindir@
 prefix=   	@prefix@
 exec_prefix=	@exec_prefix@
+DESTDIR=
 
 CC=		@CC@
 CHMOD=  	@CHMOD@
@@ -57,7 +58,7 @@ all:
 install: 
 	for f in $(MODULES); \
 	do \
-	    $(INSTALL) -m $(FILEMODE) $(srcdir)/$$f $(PACKAGEDIR); \
+	    $(INSTALL) -m $(FILEMODE) $(srcdir)/$$f $(DESTDIR)$(PACKAGEDIR); \
 	done
 
 finish: