Update of /cvsroot/mailman/mailman
In directory sc8-pr-cvs1:/tmp/cvs-serv20896
Modified Files:
Tag: Release_2_1-maint
Makefile.in
Log Message:
Backporting SF patch #683906, add $DESTDIR to install target, by
Ademar de Souza Reis Jr
Index: Makefile.in
===================================================================
RCS file: /cvsroot/mailman/mailman/Makefile.in,v
retrieving revision 2.16
retrieving revision 2.16.2.1
diff -u -d -r2.16 -r2.16.2.1
--- Makefile.in 12 Dec 2002 04:30:35 -0000 2.16
+++ Makefile.in 31 Mar 2003 19:26:57 -0000 2.16.2.1
@@ -1,4 +1,4 @@
-# Copyright (C) 1998,1999,2000,2001,2002 by the Free Software Foundation, Inc.
+# Copyright (C) 1998-2003 by the Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
@@ -28,6 +28,7 @@
prefix= @prefix@
exec_prefix= @exec_prefix@
var_prefix= @VAR_PREFIX@
+DESTDIR=
CC= @CC@
INSTALL= @INSTALL@
@@ -86,7 +87,7 @@
@echo "Creating architecture independent directories..."
@for d in $(VAR_DIRS); \
do \
- dir=$(var_prefix)/$$d; \
+ dir=$(DESTDIR)$(var_prefix)/$$d; \
if test ! -d $$dir; then \
echo "Creating directory hierarchy $$dir"; \
$(srcdir)/mkinstalldirs $$dir; \
@@ -95,10 +96,10 @@
else true; \
fi; \
done
- chmod o-r $(var_prefix)/archives/private
+ chmod o-r $(DESTDIR)$(var_prefix)/archives/private
@for d in $(ARCH_INDEP_DIRS); \
do \
- dir=$(prefix)/$$d; \
+ dir=$(DESTDIR)$(prefix)/$$d; \
if test ! -d $$dir; then \
echo "Creating directory hierarchy $$dir"; \
$(srcdir)/mkinstalldirs $$dir; \
@@ -110,7 +111,7 @@
@echo "Creating architecture dependent directories..."
@for d in $(ARCH_DEP_DIRS); \
do \
- dir=$(exec_prefix)/$$d; \
+ dir=$(DESTDIR)$(exec_prefix)/$$d; \
if test ! -d $$dir; then \
echo "Creating directory hierarchy $$dir"; \
$(srcdir)/mkinstalldirs $$dir; \
@@ -121,12 +122,15 @@
done
@for d in $(SUBDIRS); \
do \
- (cd $$d; $(MAKE) install); \
+ (cd $$d; $(MAKE) DESTDIR=$(DESTDIR) install); \
done
- $(PYTHON) -c 'from compileall import *; compile_dir("$(prefix)/Mailman")'
+ $(PYTHON) -c 'from compileall import *;
compile_dir("$(DESTDIR)$(prefix)/Mailman")'
+# Only run bin/update if we aren't installing in DESTDIR, as this
+# means there are probably no lists to deal with, and it wouldn't
+# work anyway (because of import paths.)
update:
- @(cd $(prefix) ; bin/update)
+ @(cd $(DESTDIR)$(prefix) ; test -n "$(DESTDIR)" || bin/update)
clean: $(SUBDIRS)
@for d in $(SUBDIRS); \
_______________________________________________
Mailman-checkins mailing list
[EMAIL PROTECTED]
http://mail.python.org/mailman/listinfo/mailman-checkins