Several changes to facilitate building .mo files instead of checking

them out of cvs.

- added an all target which depends on the mofiles target
- added a mofiles target which depends on the various .mo files
- doinstall depends on mofiles
- clean removes mo files
- Added potclean which replaces catclean; it removes the .files
  temporary files, the Makefile, and the .pot file
- distclean depends on both clean and potclean

1 files changed, 10 insertions, 9 deletions

diff --git a/messages/Makefile.in b/messages/Makefile.in
index bed50c2e0..1381a2a8d 100644
--- a/messages/Makefile.in
+++ b/messages/Makefile.in
@@ -44,7 +44,7 @@ CFLAGS=		$(OPT) $(DEFS)
 PACKAGEDIR= 	$(prefix)/messages
 SHELL=		/bin/sh
 DIRSETGID=	chmod g+s
-MSGFMT= 	msgfmt
+MSGFMT= 	@PYTHON@ ../build/bin/msgfmt.py
 MSGMERGE=	msgmerge
 
 # CVS available languages
@@ -71,7 +71,7 @@ PROG=		@PYTHON@ build/bin/pygettext.py
 
 # Rules
 
-all:
+all: mofiles
 
 catalogs: $(TARGETS)
 
@@ -84,8 +84,7 @@ check:
 
 install: doinstall
 
-# we should depend on the .mo files instead of making them!
-doinstall: 
+doinstall: mofiles
 	@for d in $(LANGDIRS); \
 	do \
 	    dir=$(DESTDIR)$(prefix)/$$d; \
@@ -110,18 +109,20 @@ doinstall:
 	    $(INSTALL) -m $(FILEMODE) $$po $$mo $$dir; \
 	done
 
+mofiles: $(MOFILES)
+
 finish:
 
 clean:
+	-rm -f */LC_MESSAGES/mailman.mo
+
+potclean:
 	-rm -f marked.files docstring.files
+	-rm -f Makefile $(POTFILE)
 
-distclean: clean
+distclean: clean potclean
 	-rm -f Makefile
 
-catclean:
-	-rm -f Makefile */LC_MESSAGES/mailman.mo */LC_MESSAGES/mailman.po.old $(POTFILE)
-	-rm *.pot
-
 marked.files:
 	@echo "Calculating marked input files for pygettext"
 	(cd ..; find Mailman -path '*pythonlib' -prune -o -path '*Commands/cmd_*.py' -prune -o -name '*.py' -print >| messages/$@)