Daniel Novotny 6a33e1a
diff -ruN mailman-2.1.12-a/bin/Makefile.in mailman-2.1.12-b/bin/Makefile.in
Daniel Novotny 6a33e1a
--- mailman-2.1.12-a/bin/Makefile.in	2009-02-23 22:23:35.000000000 +0100
Daniel Novotny 6a33e1a
+++ mailman-2.1.12-b/bin/Makefile.in	2009-07-28 12:19:48.000000000 +0200
9a80ca7
@@ -28,7 +28,6 @@
731f0c3
 DESTDIR=
731f0c3
 
731f0c3
 CC=		@CC@
731f0c3
-CHMOD=  	@CHMOD@
731f0c3
 INSTALL=	@INSTALL@
731f0c3
 
731f0c3
 DEFS=   	@DEFS@
Daniel Novotny 6a33e1a
@@ -56,7 +55,7 @@
731f0c3
 # Modes for directories and executables created by the install
731f0c3
 # process.  Default to group-writable directories but
731f0c3
 # user-only-writable for executables.
731f0c3
-DIRMODE=	775
731f0c3
+DIRMODE=	2775
731f0c3
 EXEMODE=	755
731f0c3
 FILEMODE=	644
9a80ca7
 INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
Daniel Novotny 6a33e1a
@@ -72,8 +71,6 @@
9a80ca7
 	    $(INSTALL) -m $(EXEMODE) $(BUILDDIR)/$$f $(DESTDIR)$(SCRIPTSDIR); \
731f0c3
 	done
731f0c3
 
9a80ca7
-finish:
9a80ca7
-
9a80ca7
 clean:
9a80ca7
 
9a80ca7
 distclean:
Daniel Novotny 6a33e1a
diff -ruN mailman-2.1.12-a/cron/Makefile.in mailman-2.1.12-b/cron/Makefile.in
Daniel Novotny 6a33e1a
--- mailman-2.1.12-a/cron/Makefile.in	2009-02-23 22:23:35.000000000 +0100
Daniel Novotny 6a33e1a
+++ mailman-2.1.12-b/cron/Makefile.in	2009-07-28 12:19:48.000000000 +0200
9a80ca7
@@ -28,7 +28,6 @@
731f0c3
 DESTDIR=
731f0c3
 
731f0c3
 CC=		@CC@
731f0c3
-CHMOD=  	@CHMOD@
731f0c3
 INSTALL=	@INSTALL@
731f0c3
 
731f0c3
 DEFS=   	@DEFS@
9a80ca7
@@ -68,8 +67,6 @@
9a80ca7
 	    $(INSTALL) -m $(EXEMODE) $(BUILDDIR)/$$f $(DESTDIR)$(CRONDIR); \
731f0c3
 	done
731f0c3
 
9a80ca7
-finish:
9a80ca7
-
9a80ca7
 clean:
9a80ca7
 
9a80ca7
 distclean:
Daniel Novotny 6a33e1a
diff -ruN mailman-2.1.12-a/Mailman/Archiver/Makefile.in mailman-2.1.12-b/Mailman/Archiver/Makefile.in
Daniel Novotny 6a33e1a
--- mailman-2.1.12-a/Mailman/Archiver/Makefile.in	2009-02-23 22:23:35.000000000 +0100
Daniel Novotny 6a33e1a
+++ mailman-2.1.12-b/Mailman/Archiver/Makefile.in	2009-07-28 12:19:48.000000000 +0200
9a80ca7
@@ -28,7 +28,6 @@
731f0c3
 DESTDIR=
731f0c3
 
731f0c3
 CC=		@CC@
731f0c3
-CHMOD=  	@CHMOD@
731f0c3
 INSTALL=	@INSTALL@
731f0c3
 
731f0c3
 DEFS=   	@DEFS@
9a80ca7
@@ -47,7 +46,7 @@
731f0c3
 # Modes for directories and executables created by the install
731f0c3
 # process.  Default to group-writable directories but
731f0c3
 # user-only-writable for executables.
731f0c3
-DIRMODE=	775
731f0c3
+DIRMODE=	2775
731f0c3
 EXEMODE=	755
731f0c3
 FILEMODE=	644
9a80ca7
 INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
9a80ca7
@@ -63,8 +62,6 @@
9a80ca7
 	    $(INSTALL) -m $(FILEMODE) $(srcdir)/$$f $(DESTDIR)$(PACKAGEDIR); \
731f0c3
 	done
731f0c3
 
9a80ca7
-finish:
9a80ca7
-
9a80ca7
 clean:
9a80ca7
 
9a80ca7
 distclean:
Daniel Novotny 6a33e1a
diff -ruN mailman-2.1.12-a/Mailman/Bouncers/Makefile.in mailman-2.1.12-b/Mailman/Bouncers/Makefile.in
Daniel Novotny 6a33e1a
--- mailman-2.1.12-a/Mailman/Bouncers/Makefile.in	2009-02-23 22:23:35.000000000 +0100
Daniel Novotny 6a33e1a
+++ mailman-2.1.12-b/Mailman/Bouncers/Makefile.in	2009-07-28 12:19:48.000000000 +0200
9a80ca7
@@ -28,7 +28,6 @@
731f0c3
 DESTDIR=
731f0c3
 
731f0c3
 CC=		@CC@
731f0c3
-CHMOD=  	@CHMOD@
731f0c3
 INSTALL=	@INSTALL@
731f0c3
 
731f0c3
 DEFS=   	@DEFS@
9a80ca7
@@ -45,7 +44,7 @@
731f0c3
 # Modes for directories and executables created by the install
731f0c3
 # process.  Default to group-writable directories but
731f0c3
 # user-only-writable for executables.
731f0c3
-DIRMODE=	775
731f0c3
+DIRMODE=	2775
731f0c3
 EXEMODE=	755
731f0c3
 FILEMODE=	644
9a80ca7
 INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
9a80ca7
@@ -61,8 +60,6 @@
9a80ca7
 	    $(INSTALL) -m $(FILEMODE) $(srcdir)/$$f $(DESTDIR)$(PACKAGEDIR); \
731f0c3
 	done
731f0c3
 
9a80ca7
-finish:
9a80ca7
-
9a80ca7
 clean:
9a80ca7
 
9a80ca7
 distclean:
Daniel Novotny 6a33e1a
diff -ruN mailman-2.1.12-a/Mailman/Cgi/Makefile.in mailman-2.1.12-b/Mailman/Cgi/Makefile.in
Daniel Novotny 6a33e1a
--- mailman-2.1.12-a/Mailman/Cgi/Makefile.in	2009-02-23 22:23:35.000000000 +0100
Daniel Novotny 6a33e1a
+++ mailman-2.1.12-b/Mailman/Cgi/Makefile.in	2009-07-28 12:19:48.000000000 +0200
9a80ca7
@@ -28,7 +28,6 @@
731f0c3
 DESTDIR=
731f0c3
 
731f0c3
 CC=		@CC@
731f0c3
-CHMOD=  	@CHMOD@
731f0c3
 INSTALL=	@INSTALL@
731f0c3
 
731f0c3
 DEFS=   	@DEFS@
9a80ca7
@@ -47,7 +46,7 @@
731f0c3
 # Modes for directories and executables created by the install
731f0c3
 # process.  Default to group-writable directories but
731f0c3
 # user-only-writable for executables.
731f0c3
-DIRMODE=	775
731f0c3
+DIRMODE=	2775
731f0c3
 EXEMODE=	755
731f0c3
 FILEMODE=	644
9a80ca7
 INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
9a80ca7
@@ -63,8 +62,6 @@
9a80ca7
 	    $(INSTALL) -m $(FILEMODE) $(srcdir)/$$f $(DESTDIR)$(CGIDIR); \
731f0c3
         done
731f0c3
 
9a80ca7
-finish:
9a80ca7
-
9a80ca7
 clean:
9a80ca7
 
9a80ca7
 distclean:
Daniel Novotny 6a33e1a
diff -ruN mailman-2.1.12-a/Mailman/Commands/Makefile.in mailman-2.1.12-b/Mailman/Commands/Makefile.in
Daniel Novotny 6a33e1a
--- mailman-2.1.12-a/Mailman/Commands/Makefile.in	2009-02-23 22:23:35.000000000 +0100
Daniel Novotny 6a33e1a
+++ mailman-2.1.12-b/Mailman/Commands/Makefile.in	2009-07-28 12:19:48.000000000 +0200
9a80ca7
@@ -28,7 +28,6 @@
731f0c3
 DESTDIR=
731f0c3
 
731f0c3
 CC=		@CC@
731f0c3
-CHMOD=  	@CHMOD@
731f0c3
 INSTALL=	@INSTALL@
731f0c3
 
731f0c3
 DEFS=   	@DEFS@
9a80ca7
@@ -45,7 +44,7 @@
731f0c3
 # Modes for directories and executables created by the install
731f0c3
 # process.  Default to group-writable directories but
731f0c3
 # user-only-writable for executables.
731f0c3
-DIRMODE=	775
731f0c3
+DIRMODE=	2775
731f0c3
 EXEMODE=	755
731f0c3
 FILEMODE=	644
9a80ca7
 INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
9a80ca7
@@ -61,8 +60,6 @@
9a80ca7
 	    $(INSTALL) -m $(FILEMODE) $(srcdir)/$$f $(DESTDIR)$(PACKAGEDIR); \
731f0c3
 	done
731f0c3
 
9a80ca7
-finish:
9a80ca7
-
9a80ca7
 clean:
9a80ca7
 
9a80ca7
 distclean:
Daniel Novotny 6a33e1a
diff -ruN mailman-2.1.12-a/Mailman/Gui/Makefile.in mailman-2.1.12-b/Mailman/Gui/Makefile.in
Daniel Novotny 6a33e1a
--- mailman-2.1.12-a/Mailman/Gui/Makefile.in	2009-02-23 22:23:35.000000000 +0100
Daniel Novotny 6a33e1a
+++ mailman-2.1.12-b/Mailman/Gui/Makefile.in	2009-07-28 12:19:48.000000000 +0200
9a80ca7
@@ -28,7 +28,6 @@
731f0c3
 DESTDIR=
731f0c3
 
731f0c3
 CC=		@CC@
731f0c3
-CHMOD=  	@CHMOD@
731f0c3
 INSTALL=	@INSTALL@
731f0c3
 
731f0c3
 DEFS=   	@DEFS@
9a80ca7
@@ -45,7 +44,7 @@
731f0c3
 # Modes for directories and executables created by the install
731f0c3
 # process.  Default to group-writable directories but
731f0c3
 # user-only-writable for executables.
731f0c3
-DIRMODE=	775
731f0c3
+DIRMODE=	2775
731f0c3
 EXEMODE=	755
731f0c3
 FILEMODE=	644
9a80ca7
 INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
9a80ca7
@@ -61,8 +60,6 @@
9a80ca7
 	    $(INSTALL) -m $(FILEMODE) $(srcdir)/$$f $(DESTDIR)$(PACKAGEDIR); \
731f0c3
 	done
731f0c3
 
9a80ca7
-finish:
9a80ca7
-
9a80ca7
 clean:
9a80ca7
 
9a80ca7
 distclean:
Daniel Novotny 6a33e1a
diff -ruN mailman-2.1.12-a/Mailman/Handlers/Makefile.in mailman-2.1.12-b/Mailman/Handlers/Makefile.in
Daniel Novotny 6a33e1a
--- mailman-2.1.12-a/Mailman/Handlers/Makefile.in	2009-02-23 22:23:35.000000000 +0100
Daniel Novotny 6a33e1a
+++ mailman-2.1.12-b/Mailman/Handlers/Makefile.in	2009-07-28 12:19:48.000000000 +0200
9a80ca7
@@ -28,7 +28,6 @@
731f0c3
 DESTDIR=
731f0c3
 
731f0c3
 CC=		@CC@
731f0c3
-CHMOD=  	@CHMOD@
731f0c3
 INSTALL=	@INSTALL@
731f0c3
 
731f0c3
 DEFS=   	@DEFS@
9a80ca7
@@ -45,7 +44,7 @@
731f0c3
 # Modes for directories and executables created by the install
731f0c3
 # process.  Default to group-writable directories but
731f0c3
 # user-only-writable for executables.
731f0c3
-DIRMODE=	775
731f0c3
+DIRMODE=	2775
731f0c3
 EXEMODE=	755
731f0c3
 FILEMODE=	644
9a80ca7
 INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
9a80ca7
@@ -61,8 +60,6 @@
9a80ca7
 	    $(INSTALL) -m $(FILEMODE) $(srcdir)/$$f $(DESTDIR)$(PACKAGEDIR); \
731f0c3
 	done
731f0c3
 
9a80ca7
-finish:
9a80ca7
-
9a80ca7
 clean:
9a80ca7
 
9a80ca7
 distclean:
Daniel Novotny 6a33e1a
diff -ruN mailman-2.1.12-a/Mailman/Logging/Makefile.in mailman-2.1.12-b/Mailman/Logging/Makefile.in
Daniel Novotny 6a33e1a
--- mailman-2.1.12-a/Mailman/Logging/Makefile.in	2009-02-23 22:23:35.000000000 +0100
Daniel Novotny 6a33e1a
+++ mailman-2.1.12-b/Mailman/Logging/Makefile.in	2009-07-28 12:19:48.000000000 +0200
9a80ca7
@@ -28,7 +28,6 @@
731f0c3
 DESTDIR=
731f0c3
 
731f0c3
 CC=		@CC@
731f0c3
-CHMOD=  	@CHMOD@
731f0c3
 INSTALL=	@INSTALL@
731f0c3
 
731f0c3
 DEFS=   	@DEFS@
9a80ca7
@@ -45,7 +44,7 @@
731f0c3
 # Modes for directories and executables created by the install
731f0c3
 # process.  Default to group-writable directories but
731f0c3
 # user-only-writable for executables.
731f0c3
-DIRMODE=	775
731f0c3
+DIRMODE=	2775
731f0c3
 EXEMODE=	755
731f0c3
 FILEMODE=	644
9a80ca7
 INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
9a80ca7
@@ -61,8 +60,6 @@
9a80ca7
 	    $(INSTALL) -m $(FILEMODE) $(srcdir)/$$f $(DESTDIR)$(PACKAGEDIR); \
731f0c3
 	done
731f0c3
 
9a80ca7
-finish:
9a80ca7
-
9a80ca7
 clean:
9a80ca7
 
9a80ca7
 distclean:
Daniel Novotny 6a33e1a
diff -ruN mailman-2.1.12-a/Mailman/Makefile.in mailman-2.1.12-b/Mailman/Makefile.in
Daniel Novotny 6a33e1a
--- mailman-2.1.12-a/Mailman/Makefile.in	2009-02-23 22:23:35.000000000 +0100
Daniel Novotny 6a33e1a
+++ mailman-2.1.12-b/Mailman/Makefile.in	2009-07-28 12:19:48.000000000 +0200
9a80ca7
@@ -20,8 +20,6 @@
731f0c3
 
731f0c3
 # Variables set by configure
731f0c3
 
731f0c3
-VERSION=	@VERSION@
731f0c3
-
731f0c3
 VPATH=		@srcdir@
731f0c3
 srcdir= 	@srcdir@
731f0c3
 bindir= 	@bindir@
9a80ca7
@@ -30,7 +28,6 @@
731f0c3
 DESTDIR=
731f0c3
 
731f0c3
 CC=		@CC@
731f0c3
-CHMOD=  	@CHMOD@
731f0c3
 INSTALL=	@INSTALL@
731f0c3
 
731f0c3
 DEFS=   	@DEFS@
9a80ca7
@@ -48,7 +45,7 @@
731f0c3
 # Modes for directories and executables created by the install
731f0c3
 # process.  Default to group-writable directories but
731f0c3
 # user-only-writable for executables.
731f0c3
-DIRMODE=	775
731f0c3
+DIRMODE=	2775
731f0c3
 EXEMODE=	755
731f0c3
 FILEMODE=	644
9a80ca7
 INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
9a80ca7
@@ -79,12 +76,6 @@
9a80ca7
 	    (cd $$d; $(MAKE) DESTDIR=$(DESTDIR) install); \
9a80ca7
 	done
731f0c3
 
9a80ca7
-finish:
9a80ca7
-	@for d in $(SUBDIRS); \
9a80ca7
-	do \
9a80ca7
-	    (cd $$d; $(MAKE) DESTDIR=$(DESTDIR) finish); \
9a80ca7
-	done
9a80ca7
-
9a80ca7
 clean:
9a80ca7
 	for d in $(SUBDIRS); \
731f0c3
 	do \
Daniel Novotny 6a33e1a
diff -ruN mailman-2.1.12-a/Mailman/MTA/Makefile.in mailman-2.1.12-b/Mailman/MTA/Makefile.in
Daniel Novotny 6a33e1a
--- mailman-2.1.12-a/Mailman/MTA/Makefile.in	2009-02-23 22:23:35.000000000 +0100
Daniel Novotny 6a33e1a
+++ mailman-2.1.12-b/Mailman/MTA/Makefile.in	2009-07-28 12:19:48.000000000 +0200
9a80ca7
@@ -28,7 +28,6 @@
731f0c3
 DESTDIR=
731f0c3
 
731f0c3
 CC=		@CC@
731f0c3
-CHMOD=  	@CHMOD@
731f0c3
 INSTALL=	@INSTALL@
731f0c3
 
731f0c3
 DEFS=   	@DEFS@
9a80ca7
@@ -45,7 +44,7 @@
731f0c3
 # Modes for directories and executables created by the install
731f0c3
 # process.  Default to group-writable directories but
731f0c3
 # user-only-writable for executables.
731f0c3
-DIRMODE=	775
731f0c3
+DIRMODE=	2775
731f0c3
 EXEMODE=	755
731f0c3
 FILEMODE=	644
9a80ca7
 INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
9a80ca7
@@ -61,8 +60,6 @@
9a80ca7
 	    $(INSTALL) -m $(FILEMODE) $(srcdir)/$$f $(DESTDIR)$(PACKAGEDIR); \
731f0c3
 	done
731f0c3
 
9a80ca7
-finish:
9a80ca7
-
9a80ca7
 clean:
9a80ca7
 
9a80ca7
 distclean:
Daniel Novotny 6a33e1a
diff -ruN mailman-2.1.12-a/Mailman/Queue/Makefile.in mailman-2.1.12-b/Mailman/Queue/Makefile.in
Daniel Novotny 6a33e1a
--- mailman-2.1.12-a/Mailman/Queue/Makefile.in	2009-02-23 22:23:35.000000000 +0100
Daniel Novotny 6a33e1a
+++ mailman-2.1.12-b/Mailman/Queue/Makefile.in	2009-07-28 12:19:48.000000000 +0200
9a80ca7
@@ -28,7 +28,6 @@
731f0c3
 DESTDIR=
731f0c3
 
731f0c3
 CC=		@CC@
731f0c3
-CHMOD=  	@CHMOD@
731f0c3
 INSTALL=	@INSTALL@
731f0c3
 
731f0c3
 DEFS=   	@DEFS@
9a80ca7
@@ -45,7 +44,7 @@
731f0c3
 # Modes for directories and executables created by the install
731f0c3
 # process.  Default to group-writable directories but
731f0c3
 # user-only-writable for executables.
731f0c3
-DIRMODE=	775
731f0c3
+DIRMODE=	2775
731f0c3
 EXEMODE=	755
731f0c3
 FILEMODE=	644
9a80ca7
 INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
9a80ca7
@@ -61,8 +60,6 @@
9a80ca7
 	    $(INSTALL) -m $(FILEMODE) $(srcdir)/$$f $(DESTDIR)$(PACKAGEDIR); \
731f0c3
 	done
731f0c3
 
9a80ca7
-finish:
9a80ca7
-
9a80ca7
 clean:
731f0c3
 
9a80ca7
 distclean:
Daniel Novotny 6a33e1a
diff -ruN mailman-2.1.12-a/Makefile.in mailman-2.1.12-b/Makefile.in
Daniel Novotny 6a33e1a
--- mailman-2.1.12-a/Makefile.in	2009-02-23 22:23:35.000000000 +0100
Daniel Novotny 6a33e1a
+++ mailman-2.1.12-b/Makefile.in	2009-07-28 12:19:48.000000000 +0200
9a80ca7
@@ -61,11 +61,10 @@
731f0c3
 # Modes for directories and executables created by the install
731f0c3
 # process.  Default to group-writable directories but
731f0c3
 # user-only-writable for executables.
731f0c3
-DIRMODE=	775
731f0c3
+DIRMODE=	2775
731f0c3
 EXEMODE=	755
731f0c3
 FILEMODE=	644
9a80ca7
 INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
731f0c3
-DIRSETGID=	chmod g+s
731f0c3
 
731f0c3
 DATE = $(shell python -c 'import time; print time.strftime("%d-%b-%Y"),')
731f0c3
 LANGPACK = README-I18N.en templates messages
9a80ca7
@@ -85,14 +84,24 @@
9a80ca7
 
9a80ca7
 doinstall: $(SUBDIRS)
9a80ca7
 	@echo "Creating architecture independent directories..."
9a80ca7
+	dir=$(DESTDIR)$(prefix); \
9a80ca7
+	if test ! -d $$dir; then \
9a80ca7
+		echo "Creating directory hierarchy $$dir"; \
9a80ca7
+		$(INSTALL) -d -m $(DIRMODE) $$dir; \
9a80ca7
+	else true; \
9a80ca7
+	fi;
9a80ca7
+	dir=$(DESTDIR)$(var_prefix); \
9a80ca7
+	if test ! -d $$dir; then \
9a80ca7
+		echo "Creating directory hierarchy $$dir"; \
9a80ca7
+		$(INSTALL) -d -m $(DIRMODE) $$dir; \
9a80ca7
+	else true; \
9a80ca7
+	fi;
9a80ca7
 	@for d in $(VAR_DIRS); \
9a80ca7
 	do \
731f0c3
 	    dir=$(DESTDIR)$(var_prefix)/$$d; \
731f0c3
 	    if test ! -d $$dir; then \
731f0c3
 		echo "Creating directory hierarchy $$dir"; \
731f0c3
-		$(srcdir)/mkinstalldirs $$dir; \
731f0c3
-		chmod $(DIRMODE) $$dir; \
731f0c3
-		$(DIRSETGID) $$dir; \
9a80ca7
+		$(INSTALL) -d -m $(DIRMODE) $$dir; \
731f0c3
 	    else true; \
731f0c3
 	    fi; \
731f0c3
 	done
9a80ca7
@@ -102,9 +111,7 @@
731f0c3
 	    dir=$(DESTDIR)$(prefix)/$$d; \
731f0c3
 	    if test ! -d $$dir; then \
731f0c3
 		echo "Creating directory hierarchy $$dir"; \
731f0c3
-		$(srcdir)/mkinstalldirs $$dir; \
731f0c3
-		chmod $(DIRMODE) $$dir; \
731f0c3
-		$(DIRSETGID) $$dir; \
9a80ca7
+		$(INSTALL) -d -m $(DIRMODE) $$dir; \
731f0c3
 	    else true; \
731f0c3
 	    fi; \
731f0c3
 	done
9a80ca7
@@ -114,9 +121,7 @@
731f0c3
 	    dir=$(DESTDIR)$(exec_prefix)/$$d; \
731f0c3
 	    if test ! -d $$dir; then \
731f0c3
 		echo "Creating directory hierarchy $$dir"; \
731f0c3
-		$(srcdir)/mkinstalldirs $$dir; \
731f0c3
-		chmod $(DIRMODE) $$dir; \
731f0c3
-		$(DIRSETGID) $$dir; \
9a80ca7
+		$(INSTALL) -d -m $(DIRMODE) $$dir; \
731f0c3
 	    else true; \
731f0c3
 	    fi; \
731f0c3
 	done
Daniel Novotny 6a33e1a
diff -ruN mailman-2.1.12-a/messages/Makefile.in mailman-2.1.12-b/messages/Makefile.in
Daniel Novotny 6a33e1a
--- mailman-2.1.12-a/messages/Makefile.in	2009-02-23 22:23:35.000000000 +0100
Daniel Novotny 6a33e1a
+++ mailman-2.1.12-b/messages/Makefile.in	2009-07-28 12:19:48.000000000 +0200
9a80ca7
@@ -32,7 +32,6 @@
731f0c3
 DESTDIR=
731f0c3
 
731f0c3
 CC=		@CC@
731f0c3
-CHMOD=  	@CHMOD@
731f0c3
 INSTALL=	@INSTALL@
731f0c3
 
731f0c3
 DEFS=   	@DEFS@
9a80ca7
@@ -43,7 +42,6 @@
731f0c3
 CFLAGS=		$(OPT) $(DEFS)
731f0c3
 PACKAGEDIR= 	$(prefix)/messages
731f0c3
 SHELL=		/bin/sh
731f0c3
-DIRSETGID=	chmod g+s
731f0c3
 MSGFMT= 	@PYTHON@ ../build/bin/msgfmt.py
731f0c3
 MSGMERGE=	msgmerge
731f0c3
 
9a80ca7
@@ -60,7 +58,7 @@
731f0c3
 # Modes for directories and executables created by the install
731f0c3
 # process.  Default to group-writable directories but
731f0c3
 # user-only-writable for executables.
731f0c3
-DIRMODE=	775
731f0c3
+DIRMODE=	2775
731f0c3
 EXEMODE=	755
731f0c3
 FILEMODE=	644
9a80ca7
 INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
9a80ca7
@@ -90,9 +88,8 @@
731f0c3
 	do \
731f0c3
 	    dir=$(DESTDIR)$(prefix)/$$d; \
731f0c3
 	    echo "Creating language directory $$dir"; \
731f0c3
-	    $(srcdir)/../mkinstalldirs $$dir; \
731f0c3
-	    chmod $(DIRMODE) $$dir; \
731f0c3
-	    $(DIRSETGID) $$dir; \
9a80ca7
+	    $(INSTALL) -d -m $(DIRMODE) `dirname $$dir`; \
9a80ca7
+	    $(INSTALL) -d -m $(DIRMODE) $$dir; \
731f0c3
 	done
731f0c3
 	@for d in $(LANGUAGES); \
731f0c3
 	do \
Daniel Novotny 6a33e1a
@@ -113,8 +110,6 @@
731f0c3
 
731f0c3
 mofiles: $(MOFILES)
9a80ca7
 
9a80ca7
-finish:
9a80ca7
-
9a80ca7
 clean:
9a80ca7
 	-rm -f */LC_MESSAGES/mailman.mo
9a80ca7
 
Daniel Novotny 6a33e1a
diff -ruN mailman-2.1.12-a/misc/Makefile.in mailman-2.1.12-b/misc/Makefile.in
Daniel Novotny 6a33e1a
--- mailman-2.1.12-a/misc/Makefile.in	2009-02-23 22:23:35.000000000 +0100
Daniel Novotny 6a33e1a
+++ mailman-2.1.12-b/misc/Makefile.in	2009-07-28 12:19:48.000000000 +0200
Daniel Novotny 6a33e1a
@@ -30,7 +30,6 @@
731f0c3
 DESTDIR=
731f0c3
 
731f0c3
 CC=		@CC@
731f0c3
-CHMOD=  	@CHMOD@
731f0c3
 INSTALL=	@INSTALL@
731f0c3
 PYTHON=		@PYTHON@
731f0c3
 
Daniel Novotny 6a33e1a
@@ -62,7 +61,7 @@
731f0c3
 # Modes for directories and executables created by the install
731f0c3
 # process.  Default to group-writable directories but
731f0c3
 # user-only-writable for executables.
731f0c3
-DIRMODE=	775
731f0c3
+DIRMODE=	2775
731f0c3
 EXEMODE=	755
731f0c3
 FILEMODE=	644
731f0c3
 DATAMODE=	664
Daniel Novotny 6a33e1a
@@ -101,8 +100,6 @@
9a80ca7
 	    (cd $(PKGDIR)/$$p ; umask 02 ; PYTHONPATH=$(PYTHONLIBDIR) $(PYTHON) $(SETUPCMD)); \
731f0c3
 	done
9a80ca7
 
9a80ca7
-finish:
9a80ca7
-
9a80ca7
 clean:
9a80ca7
 
9a80ca7
 distclean:
Daniel Novotny 6a33e1a
diff -ruN mailman-2.1.12-a/scripts/Makefile.in mailman-2.1.12-b/scripts/Makefile.in
Daniel Novotny 6a33e1a
--- mailman-2.1.12-a/scripts/Makefile.in	2009-02-23 22:23:35.000000000 +0100
Daniel Novotny 6a33e1a
+++ mailman-2.1.12-b/scripts/Makefile.in	2009-07-28 12:19:48.000000000 +0200
9a80ca7
@@ -28,7 +28,6 @@
731f0c3
 DESTDIR=
731f0c3
 
731f0c3
 CC=		@CC@
731f0c3
-CHMOD=  	@CHMOD@
731f0c3
 INSTALL=	@INSTALL@
731f0c3
 
731f0c3
 DEFS=   	@DEFS@
9a80ca7
@@ -49,7 +48,7 @@
731f0c3
 # Modes for directories and executables created by the install
731f0c3
 # process.  Default to group-writable directories but
731f0c3
 # user-only-writable for executables.
731f0c3
-DIRMODE=	775
731f0c3
+DIRMODE=	2775
731f0c3
 EXEMODE=	755
731f0c3
 FILEMODE=	644
9a80ca7
 INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
9a80ca7
@@ -68,8 +67,6 @@
9a80ca7
 	$(INSTALL) -m $(FILEMODE) $(srcdir)/join    $(DESTDIR)$(SCRIPTSDIR)/subscribe
9a80ca7
 	$(INSTALL) -m $(FILEMODE) $(srcdir)/leave   $(DESTDIR)$(SCRIPTSDIR)/unsubscribe
731f0c3
 
9a80ca7
-finish:
9a80ca7
-
9a80ca7
 clean:
731f0c3
 
9a80ca7
 distclean:
Daniel Novotny 6a33e1a
diff -ruN mailman-2.1.12-a/src/Makefile.in mailman-2.1.12-b/src/Makefile.in
Daniel Novotny 6a33e1a
--- mailman-2.1.12-a/src/Makefile.in	2009-07-28 12:19:47.000000000 +0200
Daniel Novotny 6a33e1a
+++ mailman-2.1.12-b/src/Makefile.in	2009-07-28 12:19:48.000000000 +0200
9a80ca7
@@ -28,7 +28,6 @@
731f0c3
 DESTDIR=
731f0c3
 
731f0c3
 CC=		@CC@
731f0c3
-CHMOD=  	@CHMOD@
731f0c3
 INSTALL=	@INSTALL@
731f0c3
 PYTHON=  	@PYTHON@
731f0c3
 
9a80ca7
@@ -63,10 +62,9 @@
731f0c3
 # Modes for directories and executables created by the install
731f0c3
 # process.  Default to group-writable directories but
731f0c3
 # user-only-writable for executables.
731f0c3
-DIRMODE=	775
731f0c3
-EXEMODE=	755
731f0c3
+DIRMODE=	2775
731f0c3
+EXEMODE=	2755
9a80ca7
 INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
9a80ca7
-DIRSETGID=	chmod g+s
731f0c3
 
731f0c3
 # Fixed definitions
731f0c3
 
9a80ca7
@@ -110,20 +108,10 @@
731f0c3
 	do \
731f0c3
 	    exe=$(DESTDIR)$(CGIDIR)/$$f$(CGIEXT); \
731f0c3
 	    $(INSTALL_PROGRAM) $$f $$exe; \
731f0c3
-	    $(DIRSETGID) $$exe; \
731f0c3
 	done
731f0c3
 	for f in $(MAIL_PROGS); \
731f0c3
 	do \
731f0c3
 	    $(INSTALL_PROGRAM) $$f $(DESTDIR)$(MAILDIR); \
731f0c3
-	    $(DIRSETGID) $(DESTDIR)$(MAILDIR)/$$f; \
9a80ca7
-	done
9a80ca7
-
9a80ca7
-finish:
9a80ca7
-	-for f in $(SUID_CGI_PROGS); \
9a80ca7
-	do \
9a80ca7
-	    exe=$(DESTDIR)$(CGIDIR)/$$f$(CGIEXT); \
9a80ca7
-	    chown $(MAILMAN_USER) $$exe; \
9a80ca7
-	    chmod u+s $$exe; \
731f0c3
 	done
731f0c3
 
9a80ca7
 clean:
Daniel Novotny 6a33e1a
diff -ruN mailman-2.1.12-a/templates/Makefile.in mailman-2.1.12-b/templates/Makefile.in
Daniel Novotny 6a33e1a
--- mailman-2.1.12-a/templates/Makefile.in	2009-02-23 22:23:35.000000000 +0100
Daniel Novotny 6a33e1a
+++ mailman-2.1.12-b/templates/Makefile.in	2009-07-28 12:19:48.000000000 +0200
9a80ca7
@@ -28,7 +28,6 @@
731f0c3
 DESTDIR=
731f0c3
 
731f0c3
 CC=		@CC@
731f0c3
-CHMOD=  	@CHMOD@
731f0c3
 INSTALL=	@INSTALL@
731f0c3
 TRUE=		@TRUE@
731f0c3
 
9a80ca7
@@ -48,7 +47,7 @@
731f0c3
 # Modes for directories and executables created by the install
731f0c3
 # process.  Default to group-writable directories but
731f0c3
 # user-only-writable for executables.
731f0c3
-DIRMODE=	775
731f0c3
+DIRMODE=	2775
731f0c3
 EXEMODE=	755
731f0c3
 FILEMODE=	644
9a80ca7
 INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
9a80ca7
@@ -61,15 +60,13 @@
731f0c3
 install:
731f0c3
 	for d in $(LANGUAGES); \
731f0c3
 	do \
731f0c3
-	    $(srcdir)/../mkinstalldirs $(DESTDIR)$(TEMPLATEDIR)/$$d; \
17b44c1
+	    $(INSTALL) -d -m $(DIRMODE) $(DESTDIR)$(TEMPLATEDIR)/$$d; \
731f0c3
 	    for f in $(srcdir)/$$d/*.html $(srcdir)/$$d/*.txt; \
731f0c3
 	    do \
9a80ca7
 	    	$(INSTALL) -m $(FILEMODE) $$f $(DESTDIR)$(TEMPLATEDIR)/$$d; \
731f0c3
 	    done; \
731f0c3
 	done
731f0c3
 
9a80ca7
-finish:
9a80ca7
-
9a80ca7
 clean:
9a80ca7
 
9a80ca7
 distclean:
Daniel Novotny 6a33e1a
diff -ruN mailman-2.1.12-a/tests/bounces/Makefile.in mailman-2.1.12-b/tests/bounces/Makefile.in
Daniel Novotny 6a33e1a
--- mailman-2.1.12-a/tests/bounces/Makefile.in	2009-02-23 22:23:35.000000000 +0100
Daniel Novotny 6a33e1a
+++ mailman-2.1.12-b/tests/bounces/Makefile.in	2009-07-28 12:19:48.000000000 +0200
9a80ca7
@@ -28,7 +28,6 @@
731f0c3
 DESTDIR=
731f0c3
 
731f0c3
 CC=		@CC@
731f0c3
-CHMOD=  	@CHMOD@
731f0c3
 INSTALL=	@INSTALL@
731f0c3
 
731f0c3
 DEFS=   	@DEFS@
9a80ca7
@@ -46,7 +45,7 @@
731f0c3
 # Modes for directories and executables created by the install
731f0c3
 # process.  Default to group-writable directories but
731f0c3
 # user-only-writable for executables.
731f0c3
-DIRMODE=	775
731f0c3
+DIRMODE=	2775
731f0c3
 EXEMODE=	755
731f0c3
 FILEMODE=	644
9a80ca7
 INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
9a80ca7
@@ -60,8 +59,6 @@
9a80ca7
 	    $(INSTALL) -m $(FILEMODE) $$f $(DESTDIR)$(BOUNCEDIR); \
731f0c3
 	done
731f0c3
 
9a80ca7
-finish:
9a80ca7
-
9a80ca7
 clean:
9a80ca7
 
9a80ca7
 distclean:
Daniel Novotny 6a33e1a
diff -ruN mailman-2.1.12-a/tests/Makefile.in mailman-2.1.12-b/tests/Makefile.in
Daniel Novotny 6a33e1a
--- mailman-2.1.12-a/tests/Makefile.in	2009-02-23 22:23:35.000000000 +0100
Daniel Novotny 6a33e1a
+++ mailman-2.1.12-b/tests/Makefile.in	2009-07-28 12:19:48.000000000 +0200
9a80ca7
@@ -28,7 +28,6 @@
731f0c3
 DESTDIR=
731f0c3
 
731f0c3
 CC=		@CC@
731f0c3
-CHMOD=  	@CHMOD@
731f0c3
 INSTALL=	@INSTALL@
731f0c3
 
731f0c3
 DEFS=   	@DEFS@
9a80ca7
@@ -46,7 +45,7 @@
731f0c3
 # Modes for directories and executables created by the install
731f0c3
 # process.  Default to group-writable directories but
731f0c3
 # user-only-writable for executables.
731f0c3
-DIRMODE=	775
731f0c3
+DIRMODE=	2775
731f0c3
 EXEMODE=	755
731f0c3
 FILEMODE=	644
9a80ca7
 INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
9a80ca7
@@ -71,8 +70,6 @@
9a80ca7
 	    (cd $$d; $(MAKE) DESTDIR=$(DESTDIR) install); \
731f0c3
 	done
9a80ca7
 
9a80ca7
-finish:
9a80ca7
-
9a80ca7
 clean:
9a80ca7
 
9a80ca7
 distclean:
Daniel Novotny 6a33e1a
diff -ruN mailman-2.1.12-a/tests/msgs/Makefile.in mailman-2.1.12-b/tests/msgs/Makefile.in
Daniel Novotny 6a33e1a
--- mailman-2.1.12-a/tests/msgs/Makefile.in	2009-02-23 22:23:35.000000000 +0100
Daniel Novotny 6a33e1a
+++ mailman-2.1.12-b/tests/msgs/Makefile.in	2009-07-28 12:19:48.000000000 +0200
9a80ca7
@@ -28,7 +28,6 @@
731f0c3
 DESTDIR=
731f0c3
 
731f0c3
 CC=		@CC@
731f0c3
-CHMOD=  	@CHMOD@
731f0c3
 INSTALL=	@INSTALL@
731f0c3
 
731f0c3
 DEFS=   	@DEFS@
9a80ca7
@@ -46,7 +45,7 @@
731f0c3
 # Modes for directories and executables created by the install
731f0c3
 # process.  Default to group-writable directories but
731f0c3
 # user-only-writable for executables.
731f0c3
-DIRMODE=	775
731f0c3
+DIRMODE=	2775
731f0c3
 EXEMODE=	755
731f0c3
 FILEMODE=	644
9a80ca7
 INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
9a80ca7
@@ -60,8 +59,6 @@
9a80ca7
 	    $(INSTALL) -m $(FILEMODE) $$f $(DESTDIR)$(MSGSDIR); \
731f0c3
 	done
731f0c3
 
9a80ca7
-finish:
9a80ca7
-
9a80ca7
 clean:
9a80ca7
 
9a80ca7
 distclean: