Donn Cave's patch #602087 to honor configure's --srcdir switch.

17 files changed, 25 insertions, 25 deletions

diff --git a/Mailman/Archiver/Makefile.in b/Mailman/Archiver/Makefile.in
index 90ded88e2..fe56149dc 100644
--- a/Mailman/Archiver/Makefile.in
+++ b/Mailman/Archiver/Makefile.in
@@ -59,7 +59,7 @@ all:
 install: 
 	for f in $(MODULES); \
 	do \
-	    $(INSTALL) -m $(FILEMODE) $$f $(PACKAGEDIR); \
+	    $(INSTALL) -m $(FILEMODE) $(srcdir)/$$f $(PACKAGEDIR); \
 	done
 
 finish:
diff --git a/Mailman/Bouncers/Makefile.in b/Mailman/Bouncers/Makefile.in
index 7793a7807..d4c9dfcae 100644
--- a/Mailman/Bouncers/Makefile.in
+++ b/Mailman/Bouncers/Makefile.in
@@ -57,7 +57,7 @@ all:
 install: 
 	for f in $(MODULES); \
 	do \
-	    $(INSTALL) -m $(FILEMODE) $$f $(PACKAGEDIR); \
+	    $(INSTALL) -m $(FILEMODE) $(srcdir)/$$f $(PACKAGEDIR); \
 	done
 
 finish:
diff --git a/Mailman/Cgi/Makefile.in b/Mailman/Cgi/Makefile.in
index 595f70aee..a613c2b0a 100644
--- a/Mailman/Cgi/Makefile.in
+++ b/Mailman/Cgi/Makefile.in
@@ -59,7 +59,7 @@ all:
 install:
 	for f in $(CGI_MODULES); \
 	do \
-	    $(INSTALL) -m $(FILEMODE) $$f $(CGIDIR); \
+	    $(INSTALL) -m $(FILEMODE) $(srcdir)/$$f $(CGIDIR); \
         done
 
 finish:
diff --git a/Mailman/Commands/Makefile.in b/Mailman/Commands/Makefile.in
index 0a4fe9407..bacd96291 100644
--- a/Mailman/Commands/Makefile.in
+++ b/Mailman/Commands/Makefile.in
@@ -57,7 +57,7 @@ all:
 install: 
 	for f in $(MODULES); \
 	do \
-	    $(INSTALL) -m $(FILEMODE) $$f $(PACKAGEDIR); \
+	    $(INSTALL) -m $(FILEMODE) $(srcdir)/$$f $(PACKAGEDIR); \
 	done
 
 finish:
diff --git a/Mailman/Gui/Makefile.in b/Mailman/Gui/Makefile.in
index dec879779..ea219772a 100644
--- a/Mailman/Gui/Makefile.in
+++ b/Mailman/Gui/Makefile.in
@@ -57,7 +57,7 @@ all:
 install: 
 	for f in $(MODULES); \
 	do \
-	    $(INSTALL) -m $(FILEMODE) $$f $(PACKAGEDIR); \
+	    $(INSTALL) -m $(FILEMODE) $(srcdir)/$$f $(PACKAGEDIR); \
 	done
 
 finish:
diff --git a/Mailman/Handlers/Makefile.in b/Mailman/Handlers/Makefile.in
index e9bddcb98..6123bdfbe 100644
--- a/Mailman/Handlers/Makefile.in
+++ b/Mailman/Handlers/Makefile.in
@@ -57,7 +57,7 @@ all:
 install: 
 	for f in $(MODULES); \
 	do \
-	    $(INSTALL) -m $(FILEMODE) $$f $(PACKAGEDIR); \
+	    $(INSTALL) -m $(FILEMODE) $(srcdir)/$$f $(PACKAGEDIR); \
 	done
 
 finish:
diff --git a/Mailman/Logging/Makefile.in b/Mailman/Logging/Makefile.in
index 2870bd10a..407f39a9c 100644
--- a/Mailman/Logging/Makefile.in
+++ b/Mailman/Logging/Makefile.in
@@ -57,7 +57,7 @@ all:
 install: 
 	for f in $(MODULES); \
 	do \
-	    $(INSTALL) -m $(FILEMODE) $$f $(PACKAGEDIR); \
+	    $(INSTALL) -m $(FILEMODE) $(srcdir)/$$f $(PACKAGEDIR); \
 	done
 
 finish:
diff --git a/Mailman/MTA/Makefile.in b/Mailman/MTA/Makefile.in
index 2f2ec5362..42a6fcc5e 100644
--- a/Mailman/MTA/Makefile.in
+++ b/Mailman/MTA/Makefile.in
@@ -57,7 +57,7 @@ all:
 install: 
 	for f in $(MODULES); \
 	do \
-	    $(INSTALL) -m $(FILEMODE) $$f $(PACKAGEDIR); \
+	    $(INSTALL) -m $(FILEMODE) $(srcdir)/$$f $(PACKAGEDIR); \
 	done
 
 finish:
diff --git a/Mailman/Makefile.in b/Mailman/Makefile.in
index 669363dd8..d6fec07b8 100644
--- a/Mailman/Makefile.in
+++ b/Mailman/Makefile.in
@@ -41,7 +41,7 @@ CFLAGS=		$(OPT) $(DEFS)
 PACKAGEDIR= 	$(prefix)/Mailman
 SHELL=		/bin/sh
 
-MODULES=	*.py
+MODULES=	$(srcdir)/*.py
 SUBDIRS=	Cgi Logging Archiver Handlers Bouncers Queue MTA Gui Commands
 
 # Modes for directories and executables created by the install
diff --git a/Mailman/Queue/Makefile.in b/Mailman/Queue/Makefile.in
index 679c72a9c..a92ae67df 100644
--- a/Mailman/Queue/Makefile.in
+++ b/Mailman/Queue/Makefile.in
@@ -57,7 +57,7 @@ all:
 install: 
 	for f in $(MODULES); \
 	do \
-	    $(INSTALL) -m $(FILEMODE) $$f $(PACKAGEDIR); \
+	    $(INSTALL) -m $(FILEMODE) $(srcdir)/$$f $(PACKAGEDIR); \
 	done
 
 finish:
diff --git a/Makefile.in b/Makefile.in
index 7a5d028a3..ad4367c39 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -89,7 +89,7 @@ doinstall: $(SUBDIRS)
 	    dir=$(var_prefix)/$$d; \
 	    if test ! -d $$dir; then \
 		echo "Creating directory hierarchy $$dir"; \
-		./mkinstalldirs $$dir; \
+		$(srcdir)/mkinstalldirs $$dir; \
 		chmod $(DIRMODE) $$dir; \
 		$(DIRSETGID) $$dir; \
 	    else true; \
@@ -101,7 +101,7 @@ doinstall: $(SUBDIRS)
 	    dir=$(prefix)/$$d; \
 	    if test ! -d $$dir; then \
 		echo "Creating directory hierarchy $$dir"; \
-		./mkinstalldirs $$dir; \
+		$(srcdir)/mkinstalldirs $$dir; \
 		chmod $(DIRMODE) $$dir; \
 		$(DIRSETGID) $$dir; \
 	    else true; \
@@ -113,7 +113,7 @@ doinstall: $(SUBDIRS)
 	    dir=$(exec_prefix)/$$d; \
 	    if test ! -d $$dir; then \
 		echo "Creating directory hierarchy $$dir"; \
-		./mkinstalldirs $$dir; \
+		$(srcdir)/mkinstalldirs $$dir; \
 		chmod $(DIRMODE) $$dir; \
 		$(DIRSETGID) $$dir; \
 	    else true; \
diff --git a/misc/Makefile.in b/misc/Makefile.in
index 1e3ccfc4b..bf2a08593 100644
--- a/misc/Makefile.in
+++ b/misc/Makefile.in
@@ -66,7 +66,7 @@ DATAMODE=	664
 INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
 
 PATHSDIRS=	bin cron scripts tests
-ICONS=		*.jpg *.png
+ICONS=		$(srcdir)/*.jpg $(srcdir)/*.png
 
 # Rules
 
@@ -86,7 +86,7 @@ install-other:
 install-packages:
 	for p in $(PACKAGES); \
 	do \
-	    gunzip -c $$p.tar.gz | tar xf -; \
+	    gunzip -c $(srcdir)/$$p.tar.gz | tar xf -; \
 	    (cd $$p ; umask 02 ; PYTHONPATH=$(PYTHONLIBDIR) $(PYTHON) $(SETUPCMD)); \
 	done
 
diff --git a/scripts/Makefile.in b/scripts/Makefile.in
index 1c0f12289..c3971066e 100644
--- a/scripts/Makefile.in
+++ b/scripts/Makefile.in
@@ -61,11 +61,11 @@ all:
 install:
 	for f in $(SCRIPTS); \
 	do \
-	    $(INSTALL) -m $(FILEMODE) $$f $(SCRIPTSDIR); \
+	    $(INSTALL) -m $(FILEMODE) $(srcdir)/$$f $(SCRIPTSDIR); \
 	done
-	$(INSTALL) -m $(FILEMODE) bounces $(SCRIPTSDIR)/admin
-	$(INSTALL) -m $(FILEMODE) join    $(SCRIPTSDIR)/subscribe
-	$(INSTALL) -m $(FILEMODE) leave   $(SCRIPTSDIR)/unsubscribe
+	$(INSTALL) -m $(FILEMODE) $(srcdir)/bounces $(SCRIPTSDIR)/admin
+	$(INSTALL) -m $(FILEMODE) $(srcdir)/join    $(SCRIPTSDIR)/subscribe
+	$(INSTALL) -m $(FILEMODE) $(srcdir)/leave   $(SCRIPTSDIR)/unsubscribe
 
 finish:
 
diff --git a/src/Makefile.in b/src/Makefile.in
index 2a8b9f6e8..05e144f27 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -98,10 +98,10 @@ mailman: $(srcdir)/mail-wrapper.c $(COMMONOBJS)
 $(CGI_PROGS): $(srcdir)/cgi-wrapper.c $(COMMONOBJS)
 	$(CC) -DSCRIPT="\"$@\"" -I. $(CGI_FLAGS) $(CFLAGS) $(COMMONOBJS) -o $@ $(srcdir)/cgi-wrapper.c
 
-common.o: $(srcdir)/common.c $(srcdir)/common.h $(srcdir)/Makefile
+common.o: $(srcdir)/common.c $(srcdir)/common.h Makefile
 	$(CC) -c -I. $(COMMON_FLAGS) $(CFLAGS) $(srcdir)/common.c
 
-vsnprintf.o: $(srcdir)/vsnprintf.c $(srcdir)/Makefile
+vsnprintf.o: $(srcdir)/vsnprintf.c Makefile
 	$(CC) -c -I. $(COMMON_FLAGS) $(CFLAGS) $(srcdir)/vsnprintf.c
 
 install: all
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 7809cadc1..9c1f57091 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -39,8 +39,8 @@ CFLAGS=		$(OPT) $(DEFS)
 TESTDIR=	$(prefix)/tests
 SHELL=		/bin/sh
 
-TEST_MODULES=	test*.py *Base.py
-EXECS=  	onebounce.py fblast.py
+TEST_MODULES=	$(srcdir)/test*.py $(srcdir)/*Base.py
+EXECS=  	$(srcdir)/onebounce.py $(srcdir)/fblast.py
 
 # Modes for directories and executables created by the install
 # process.  Default to group-writable directories but
diff --git a/tests/bounces/Makefile.in b/tests/bounces/Makefile.in
index 1cb530e68..120832d30 100644
--- a/tests/bounces/Makefile.in
+++ b/tests/bounces/Makefile.in
@@ -39,7 +39,7 @@ CFLAGS=		$(OPT) $(DEFS)
 BOUNCEDIR=	$(prefix)/tests/bounces
 SHELL=		/bin/sh
 
-BOUNCE_FILES=	*.txt
+BOUNCE_FILES=	$(srcdir)/*.txt
 
 
 # Modes for directories and executables created by the install
diff --git a/tests/msgs/Makefile.in b/tests/msgs/Makefile.in
index 77423cd1e..3844820b6 100644
--- a/tests/msgs/Makefile.in
+++ b/tests/msgs/Makefile.in
@@ -39,7 +39,7 @@ CFLAGS=		$(OPT) $(DEFS)
 MSGSDIR=	$(prefix)/tests/msgs
 SHELL=		/bin/sh
 
-MSG_FILES=	*.txt
+MSG_FILES=	$(srcdir)/*.txt
 
 
 # Modes for directories and executables created by the install