From 5a6aeea41cd141bc4e962381284cbeeefa7bf4d9 Mon Sep 17 00:00:00 2001 From: bwarsaw <> Date: Mon, 31 Mar 2003 19:27:17 +0000 Subject: Backporting SF patch #683906, add $DESTDIR to install target, by Ademar de Souza Reis Jr --- Mailman/Archiver/Makefile.in | 5 +++-- Mailman/Bouncers/Makefile.in | 5 +++-- Mailman/Cgi/Makefile.in | 5 +++-- Mailman/Commands/Makefile.in | 5 +++-- Mailman/Gui/Makefile.in | 5 +++-- Mailman/Handlers/Makefile.in | 5 +++-- Mailman/Logging/Makefile.in | 5 +++-- Mailman/MTA/Makefile.in | 5 +++-- Mailman/Makefile.in | 15 ++++++++------- Mailman/Queue/Makefile.in | 5 +++-- Makefile.in | 20 ++++++++++++-------- bin/Makefile.in | 5 +++-- cron/Makefile.in | 7 ++++--- messages/Makefile.in | 9 +++++---- misc/Makefile.in | 20 +++++++++++--------- scripts/Makefile.in | 11 ++++++----- src/Makefile.in | 13 +++++++------ templates/Makefile.in | 7 ++++--- tests/Makefile.in | 11 ++++++----- tests/bounces/Makefile.in | 7 ++++--- tests/msgs/Makefile.in | 7 ++++--- 21 files changed, 101 insertions(+), 76 deletions(-) diff --git a/Mailman/Archiver/Makefile.in b/Mailman/Archiver/Makefile.in index fe56149d..37825d0c 100644 --- a/Mailman/Archiver/Makefile.in +++ b/Mailman/Archiver/Makefile.in @@ -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 @@ -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 d4c9dfca..40594107 100644 --- a/Mailman/Bouncers/Makefile.in +++ b/Mailman/Bouncers/Makefile.in @@ -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 @@ -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 a613c2b0..ee7cb8bd 100644 --- a/Mailman/Cgi/Makefile.in +++ b/Mailman/Cgi/Makefile.in @@ -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 @@ -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 bacd9629..a695adba 100644 --- a/Mailman/Commands/Makefile.in +++ b/Mailman/Commands/Makefile.in @@ -1,4 +1,4 @@ -# Copyright (C) 2002 by the Free Software Foundation, Inc. +# Copyright (C) 2002-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 @@ -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 ea219772..28ee9590 100644 --- a/Mailman/Gui/Makefile.in +++ b/Mailman/Gui/Makefile.in @@ -1,4 +1,4 @@ -# Copyright (C) 2000,2001,2002 by the Free Software Foundation, Inc. +# Copyright (C) 2000-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 @@ -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 6123bdfb..b625c1e5 100644 --- a/Mailman/Handlers/Makefile.in +++ b/Mailman/Handlers/Makefile.in @@ -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 @@ -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 407f39a9..481b7b2f 100644 --- a/Mailman/Logging/Makefile.in +++ b/Mailman/Logging/Makefile.in @@ -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 @@ -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 42a6fcc5..57a733f3 100644 --- a/Mailman/MTA/Makefile.in +++ b/Mailman/MTA/Makefile.in @@ -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 @@ -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 d6fec07b..7295b2bb 100644 --- a/Mailman/Makefile.in +++ b/Mailman/Makefile.in @@ -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 @@ -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 a92ae67d..1d1922d8 100644 --- a/Mailman/Queue/Makefile.in +++ b/Mailman/Queue/Makefile.in @@ -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 @@ -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/Makefile.in b/Makefile.in index ad4367c3..d370be76 100644 --- a/Makefile.in +++ b/Makefile.in @@ -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 @@ bindir= @bindir@ prefix= @prefix@ exec_prefix= @exec_prefix@ var_prefix= @VAR_PREFIX@ +DESTDIR= CC= @CC@ INSTALL= @INSTALL@ @@ -86,7 +87,7 @@ doinstall: $(SUBDIRS) @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 @@ doinstall: $(SUBDIRS) 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 @@ doinstall: $(SUBDIRS) @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 @@ doinstall: $(SUBDIRS) 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); \ diff --git a/bin/Makefile.in b/bin/Makefile.in index a406ca46..2c93f9a3 100644 --- a/bin/Makefile.in +++ b/bin/Makefile.in @@ -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 @@ -25,6 +25,7 @@ srcdir= @srcdir@ bindir= @bindir@ prefix= @prefix@ exec_prefix= @exec_prefix@ +DESTDIR= CC= @CC@ CHMOD= @CHMOD@ @@ -67,7 +68,7 @@ all: install: for f in $(SCRIPTS); \ do \ - $(INSTALL) -m $(EXEMODE) $(BUILDDIR)/$$f $(SCRIPTSDIR); \ + $(INSTALL) -m $(EXEMODE) $(BUILDDIR)/$$f $(DESTDIR)$(SCRIPTSDIR); \ done finish: diff --git a/cron/Makefile.in b/cron/Makefile.in index 2f596751..9365a6d8 100644 --- a/cron/Makefile.in +++ b/cron/Makefile.in @@ -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 @@ -25,6 +25,7 @@ srcdir= @srcdir@ bindir= @bindir@ prefix= @prefix@ exec_prefix= @exec_prefix@ +DESTDIR= CC= @CC@ CHMOD= @CHMOD@ @@ -60,11 +61,11 @@ all: install: for f in $(FILES); \ do \ - $(INSTALL) -m $(FILEMODE) $$f $(CRONDIR); \ + $(INSTALL) -m $(FILEMODE) $$f $(DESTDIR)$(CRONDIR); \ done for f in $(PROGRAMS); \ do \ - $(INSTALL) -m $(EXEMODE) $(BUILDDIR)/$$f $(CRONDIR); \ + $(INSTALL) -m $(EXEMODE) $(BUILDDIR)/$$f $(DESTDIR)$(CRONDIR); \ done finish: diff --git a/messages/Makefile.in b/messages/Makefile.in index e4fb0dde..c7fe096b 100644 --- a/messages/Makefile.in +++ b/messages/Makefile.in @@ -1,4 +1,4 @@ -# Copyright (C) 2001,2002 by the Free Software Foundation, Inc. +# Copyright (C) 2001-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 @@ -29,6 +29,7 @@ srcdir= @srcdir@ bindir= @bindir@ prefix= @prefix@ exec_prefix= @exec_prefix@ +DESTDIR= CC= @CC@ CHMOD= @CHMOD@ @@ -87,7 +88,7 @@ install: doinstall doinstall: @for d in $(LANGDIRS); \ do \ - dir=$(prefix)/$$d; \ + dir=$(DESTDIR)$(prefix)/$$d; \ echo "Creating language directory $$dir"; \ $(srcdir)/../mkinstalldirs $$dir; \ chmod $(DIRMODE) $$dir; \ @@ -98,14 +99,14 @@ doinstall: readme=$(srcdir)/$$d/README.$$d; \ if test -f $$readme; \ then \ - $(INSTALL) -m $(FILEMODE) $$readme $(prefix)/messages/$$d; \ + $(INSTALL) -m $(FILEMODE) $$readme $(DESTDIR)$(prefix)/messages/$$d; \ fi; \ done @for d in $(LANGUAGES); \ do \ po=$(srcdir)/$$d/LC_MESSAGES/mailman.po; \ mo=$(srcdir)/$$d/LC_MESSAGES/mailman.mo; \ - dir=$(prefix)/messages/$$d/LC_MESSAGES; \ + dir=$(DESTDIR)$(prefix)/messages/$$d/LC_MESSAGES; \ $(INSTALL) -m $(FILEMODE) $$po $$mo $$dir; \ done diff --git a/misc/Makefile.in b/misc/Makefile.in index bf2a0859..af91f6e6 100644 --- a/misc/Makefile.in +++ b/misc/Makefile.in @@ -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 @@ -26,6 +26,7 @@ bindir= @bindir@ prefix= @prefix@ exec_prefix= @exec_prefix@ var_prefix= @VAR_PREFIX@ +DESTDIR= CC= @CC@ CHMOD= @CHMOD@ @@ -40,17 +41,17 @@ OPT= @OPT@ CFLAGS= $(OPT) $(DEFS) PACKAGEDIR= $(prefix)/Mailman DATADIR= $(var_prefix)/data -ICONDIR= $(prefix)/icons +ICONDIR= $(prefix)/icons SCRIPTSDIR= $(prefix)/scripts SHELL= /bin/sh PYTHONLIBDIR= $(prefix)/pythonlib -SETUPINSTOPTS= --install-lib $(PYTHONLIBDIR) \ - --install-purelib $(PYTHONLIBDIR) \ - --install-data $(PYTHONLIBDIR) +SETUPINSTOPTS= --install-lib $(DESTDIR)$(PYTHONLIBDIR) \ + --install-purelib $(DESTDIR)$(PYTHONLIBDIR) \ + --install-data $(DESTDIR)$(PYTHONLIBDIR) SETUPCMD= setup.py --quiet install $(SETUPINSTOPTS) -EMAILPKG= email-2.4.3 +EMAILPKG= email-2.5.1 JACODECSPKG= JapaneseCodecs-1.4.9 KOCODECSPKG= KoreanCodecs-2.0.5 @@ -75,13 +76,14 @@ all: install: install-other install-packages install-other: - $(INSTALL) -m $(FILEMODE) $(ICONS) $(ICONDIR) + $(INSTALL) -m $(FILEMODE) $(ICONS) $(DESTDIR)$(ICONDIR) for d in $(PATHSDIRS); \ do \ - dir=$(prefix)/$$d; \ + dir=$(DESTDIR)$(prefix)/$$d; \ $(INSTALL) -m $(FILEMODE) paths.py $$dir; \ done - $(INSTALL) -m $(EXEMODE) mailman $(SCRIPTSDIR) + $(INSTALL) -m $(EXEMODE) mailman $(DESTDIR)$(SCRIPTSDIR) + $(INSTALL) -m $(FILEMODE) sitelist.cfg $(DESTDIR)$(DATADIR) install-packages: for p in $(PACKAGES); \ diff --git a/scripts/Makefile.in b/scripts/Makefile.in index c3971066..7cedea83 100644 --- a/scripts/Makefile.in +++ b/scripts/Makefile.in @@ -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 @@ -25,6 +25,7 @@ srcdir= @srcdir@ bindir= @bindir@ prefix= @prefix@ exec_prefix= @exec_prefix@ +DESTDIR= CC= @CC@ CHMOD= @CHMOD@ @@ -61,11 +62,11 @@ all: install: for f in $(SCRIPTS); \ do \ - $(INSTALL) -m $(FILEMODE) $(srcdir)/$$f $(SCRIPTSDIR); \ + $(INSTALL) -m $(FILEMODE) $(srcdir)/$$f $(DESTDIR)$(SCRIPTSDIR); \ done - $(INSTALL) -m $(FILEMODE) $(srcdir)/bounces $(SCRIPTSDIR)/admin - $(INSTALL) -m $(FILEMODE) $(srcdir)/join $(SCRIPTSDIR)/subscribe - $(INSTALL) -m $(FILEMODE) $(srcdir)/leave $(SCRIPTSDIR)/unsubscribe + $(INSTALL) -m $(FILEMODE) $(srcdir)/bounces $(DESTDIR)$(SCRIPTSDIR)/admin + $(INSTALL) -m $(FILEMODE) $(srcdir)/join $(DESTDIR)$(SCRIPTSDIR)/subscribe + $(INSTALL) -m $(FILEMODE) $(srcdir)/leave $(DESTDIR)$(SCRIPTSDIR)/unsubscribe finish: diff --git a/src/Makefile.in b/src/Makefile.in index 05e144f2..95f57705 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -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 @@ -25,6 +25,7 @@ exec_prefix= @exec_prefix@ VPATH= @srcdir@ srcdir= @srcdir@ bindir= @bindir@ +DESTDIR= CC= @CC@ CHMOD= @CHMOD@ @@ -107,22 +108,22 @@ vsnprintf.o: $(srcdir)/vsnprintf.c Makefile install: all for f in $(CGI_PROGS); \ do \ - exe=$(CGIDIR)/$$f$(CGIEXT); \ + exe=$(DESTDIR)$(CGIDIR)/$$f$(CGIEXT); \ $(INSTALL_PROGRAM) $$f $$exe; \ $(DIRSETGID) $$exe; \ done for f in $(MAIL_PROGS); \ do \ - $(INSTALL_PROGRAM) $$f $(MAILDIR); \ - $(DIRSETGID) $(MAILDIR)/$$f; \ + $(INSTALL_PROGRAM) $$f $(DESTDIR)$(MAILDIR); \ + $(DIRSETGID) $(DESTDIR)$(MAILDIR)/$$f; \ done finish: -for f in $(SUID_CGI_PROGS); \ do \ - exe=$(CGIDIR)/$$f$(CGIEXT); \ - chmod u+s $$exe; \ + exe=$(DESTDIR)$(CGIDIR)/$$f$(CGIEXT); \ chown $(MAILMAN_USER) $$exe; \ + chmod u+s $$exe; \ done clean: diff --git a/templates/Makefile.in b/templates/Makefile.in index 9eb369be..17db2c1f 100644 --- a/templates/Makefile.in +++ b/templates/Makefile.in @@ -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 @@ -25,6 +25,7 @@ srcdir= @srcdir@ bindir= @bindir@ prefix= @prefix@ exec_prefix= @exec_prefix@ +DESTDIR= CC= @CC@ CHMOD= @CHMOD@ @@ -59,10 +60,10 @@ all: install: for d in $(LANGUAGES); \ do \ - $(srcdir)/../mkinstalldirs $(TEMPLATEDIR)/$$d; \ + $(srcdir)/../mkinstalldirs $(DESTDIR)$(TEMPLATEDIR)/$$d; \ for f in $(srcdir)/$$d/*.html $(srcdir)/$$d/*.txt; \ do \ - $(INSTALL) -m $(FILEMODE) $$f $(TEMPLATEDIR)/$$d; \ + $(INSTALL) -m $(FILEMODE) $$f $(DESTDIR)$(TEMPLATEDIR)/$$d; \ done; \ done diff --git a/tests/Makefile.in b/tests/Makefile.in index f04397c4..c4a03a05 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -1,4 +1,4 @@ -# Copyright (C) 2001 by the Free Software Foundation, Inc. +# Copyright (C) 2001-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 @@ -25,6 +25,7 @@ srcdir= @srcdir@ bindir= @bindir@ prefix= @prefix@ exec_prefix= @exec_prefix@ +DESTDIR= CC= @CC@ CHMOD= @CHMOD@ @@ -59,15 +60,15 @@ all: install: for f in $(TEST_MODULES); \ do \ - $(INSTALL) -m $(FILEMODE) $$f $(TESTDIR); \ + $(INSTALL) -m $(FILEMODE) $$f $(DESTDIR)$(TESTDIR); \ done for f in $(EXECS); \ do \ - $(INSTALL) -m $(EXEMODE) $$f $(TESTDIR); \ - done + $(INSTALL) -m $(EXEMODE) $$f $(DESTDIR)$(TESTDIR); \ + done for d in $(SUBDIRS); \ do \ - (cd $$d; $(MAKE) install); \ + (cd $$d; $(MAKE) DESTDIR=$(DESTDIR) install); \ done finish: diff --git a/tests/bounces/Makefile.in b/tests/bounces/Makefile.in index 120832d3..1aaa9ff9 100644 --- a/tests/bounces/Makefile.in +++ b/tests/bounces/Makefile.in @@ -1,4 +1,4 @@ -# Copyright (C) 2001 by the Free Software Foundation, Inc. +# Copyright (C) 2001-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 @@ -25,6 +25,7 @@ srcdir= @srcdir@ bindir= @bindir@ prefix= @prefix@ exec_prefix= @exec_prefix@ +DESTDIR= CC= @CC@ CHMOD= @CHMOD@ @@ -56,8 +57,8 @@ all: install: for f in $(BOUNCE_FILES); \ do \ - $(INSTALL) -m $(FILEMODE) $$f $(BOUNCEDIR); \ - done + $(INSTALL) -m $(FILEMODE) $$f $(DESTDIR)$(BOUNCEDIR); \ + done finish: diff --git a/tests/msgs/Makefile.in b/tests/msgs/Makefile.in index 3844820b..b1afe250 100644 --- a/tests/msgs/Makefile.in +++ b/tests/msgs/Makefile.in @@ -1,4 +1,4 @@ -# Copyright (C) 2001 by the Free Software Foundation, Inc. +# Copyright (C) 2001-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 @@ -25,6 +25,7 @@ srcdir= @srcdir@ bindir= @bindir@ prefix= @prefix@ exec_prefix= @exec_prefix@ +DESTDIR= CC= @CC@ CHMOD= @CHMOD@ @@ -56,8 +57,8 @@ all: install: for f in $(MSG_FILES); \ do \ - $(INSTALL) -m $(FILEMODE) $$f $(MSGSDIR); \ - done + $(INSTALL) -m $(FILEMODE) $$f $(DESTDIR)$(MSGSDIR); \ + done finish: -- cgit v1.2.3