summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbwarsaw2002-12-12 04:35:44 +0000
committerbwarsaw2002-12-12 04:35:44 +0000
commit769e5e71c30c3355c57e345af44bc522c09a4aaa (patch)
treefa1face3c21ba9257f31a56c52fcaf45268d9414
parentae7b2c1701e8342c6903953ad7658eeded5cf95e (diff)
downloadmailman-769e5e71c30c3355c57e345af44bc522c09a4aaa.tar.gz
mailman-769e5e71c30c3355c57e345af44bc522c09a4aaa.tar.zst
mailman-769e5e71c30c3355c57e345af44bc522c09a4aaa.zip
Matthias Juchem's patch #645421 for fixing "make distclean" in the
messages and tests subdirectories.
-rw-r--r--messages/Makefile.in9
-rw-r--r--templates/Makefile.in4
-rw-r--r--tests/Makefile.in4
3 files changed, 11 insertions, 6 deletions
diff --git a/messages/Makefile.in b/messages/Makefile.in
index f3821bdd1..5e373efca 100644
--- a/messages/Makefile.in
+++ b/messages/Makefile.in
@@ -89,13 +89,13 @@ doinstall:
do \
dir=$(prefix)/$$d; \
echo "Creating language directory $$dir"; \
- ../mkinstalldirs $$dir; \
+ $(srcdir)/../mkinstalldirs $$dir; \
chmod $(DIRMODE) $$dir; \
$(DIRSETGID) $$dir; \
done
@for d in $(LANGUAGES); \
do \
- readme=$$d/README.$$d; \
+ readme=$(srcdir)/$$d/README.$$d; \
if test -f $$readme; \
then \
$(INSTALL) -m $(FILEMODE) $$readme $(prefix)/messages/$$d; \
@@ -103,8 +103,8 @@ doinstall:
done
@for d in $(LANGUAGES); \
do \
- po=$$d/LC_MESSAGES/mailman.po; \
- mo=$$d/LC_MESSAGES/mailman.mo; \
+ po=$(srcdir)/$$d/LC_MESSAGES/mailman.po; \
+ mo=$(srcdir)/$$d/LC_MESSAGES/mailman.mo; \
dir=$(prefix)/messages/$$d/LC_MESSAGES; \
$(INSTALL) -m $(FILEMODE) $$po $$mo $$dir; \
done
@@ -115,6 +115,7 @@ clean:
-rm -f marked.files docstring.files
distclean: clean
+ -rm -f Makefile
catclean:
-rm -f Makefile */LC_MESSAGES/mailman.mo */LC_MESSAGES/mailman.po.old $(POTFILE)
diff --git a/templates/Makefile.in b/templates/Makefile.in
index d77085275..7b314d826 100644
--- a/templates/Makefile.in
+++ b/templates/Makefile.in
@@ -59,8 +59,8 @@ all:
install:
for d in $(LANGUAGES); \
do \
- ../mkinstalldirs $(TEMPLATEDIR)/$$d; \
- for f in $$d/*.html $$d/*.txt; \
+ $(srcdir)/../mkinstalldirs $(TEMPLATEDIR)/$$d; \
+ for f in $(srcdir)/$$d/*.html $(srcdir)/$$d/*.txt; \
do \
$(INSTALL) -m $(FILEMODE) $$f $(TEMPLATEDIR)/$$d; \
done; \
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 9c1f57091..f04397c4f 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -77,3 +77,7 @@ clean:
distclean:
-rm *.pyc
-rm Makefile
+ @for d in $(SUBDIRS); \
+ do \
+ (cd $$d; $(MAKE) distclean); \
+ done