summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbwarsaw1998-11-17 23:51:05 +0000
committerbwarsaw1998-11-17 23:51:05 +0000
commitcc5ba3a14be8a3242c8282153d1b920704eebe9a (patch)
tree03a99277a93acb147183990d687cfc76b90199cd
parent9b832e185fb29d6573a3aa70186cc6593f5dcfee (diff)
downloadmailman-cc5ba3a14be8a3242c8282153d1b920704eebe9a.tar.gz
mailman-cc5ba3a14be8a3242c8282153d1b920704eebe9a.tar.zst
mailman-cc5ba3a14be8a3242c8282153d1b920704eebe9a.zip
`make distclean' now removes stray .pyc files. Also, fixes for the
problem that installing would always clobber $prefix/Mailman/mm_cfg.py file. We no longer generate mm_cfg.py but instead mm_cfg.py.dist and this is what gets copied to $prefix/Mailman. If $prefix/Mailman/mm_cfg.py doesn't exist then mm_cfg.py.dist gets copied to it. .cvsignore should ignore mm_cfg.py.dist now instead
-rw-r--r--Mailman/.cvsignore2
-rw-r--r--Mailman/Makefile.in9
2 files changed, 6 insertions, 5 deletions
diff --git a/Mailman/.cvsignore b/Mailman/.cvsignore
index b88314d05..4ef7207b0 100644
--- a/Mailman/.cvsignore
+++ b/Mailman/.cvsignore
@@ -1,3 +1,3 @@
Makefile
-mm_cfg.py
+mm_cfg.py.dist
Defaults.py
diff --git a/Mailman/Makefile.in b/Mailman/Makefile.in
index 9928c06fd..9fc34950d 100644
--- a/Mailman/Makefile.in
+++ b/Mailman/Makefile.in
@@ -66,10 +66,10 @@ install:
do \
$(INSTALL) -m $(FILEMODE) $$f $(PACKAGEDIR); \
done
- $(INSTALL) -m $(FILEMODE) mm_cfg.py $(PACKAGEDIR)/mm_cfg.py.dist
- if test ! -f $(PACKAGEDIR)/mm_cfg.py; \
+ $(INSTALL) -m $(FILEMODE) mm_cfg.py.dist $(PACKAGEDIR)
+ if [ ! -f $(PACKAGEDIR)/mm_cfg.py ]; \
then \
- $(INSTALL) -m $(FILEMODE) mm_cfg.py $(PACKAGEDIR); \
+ $(INSTALL) -m $(FILEMODE) mm_cfg.py.dist $(PACKAGEDIR)/mm_cfg.py; \
fi
for d in $(SUBDIRS); \
do \
@@ -89,7 +89,8 @@ clean:
done
distclean:
- -rm Makefile Defaults.py mm_cfg.py
+ -rm Makefile Defaults.py mm_cfg.py.dist
+ -rm *.pyc
for d in $(SUBDIRS); \
do \
(cd $$d; $(MAKE) distclean); \