Build UTF-8 conversion in build/ instead of mutating sources

make was running convert_to_utf8 on templates/ and messages/ in the
source tree, rewriting tracked .po and template files and blocking git pull.
Copy locales into build/templates and build/messages, convert there, and
install from the build copies so repository sources stay unchanged.

Author: jaredmauch

messages/Makefile.in

@@ -43,6 +43,7 @@ DEFS=   	@DEFS@
 OPT=		@OPT@
 CFLAGS=		$(OPT) $(DEFS)
 PACKAGEDIR= 	$(prefix)/messages
+BUILDDIR=	../build/messages
 SHELL=		/bin/sh
 DIRSETGID=	chmod g+s
 MSGFMT= 	$(PYTHON) ../build/bin/msgfmt.py
@@ -55,8 +56,8 @@ LANGUAGES=	ar ast ca cs da de el eo es et eu fa fi fr gl he hr hu ia it \
 LANGDIRS=	$(LANGUAGES:%=messages/%/LC_MESSAGES)
 # Human readable po file
 POFILES=	$(LANGUAGES:%=%/LC_MESSAGES/mailman.po)
-# Binary generated mo file
-MOFILES=	$(LANGUAGES:%=%/LC_MESSAGES/mailman.mo)
+# Binary generated mo file (built under BUILDDIR, not in the source tree)
+MOFILES=	$(LANGUAGES:%=$(BUILDDIR)/%/LC_MESSAGES/mailman.mo)
 TARGETS=	$(MOFILES)
 
 # Modes for directories and executables created by the install
@@ -68,9 +69,8 @@ FILEMODE=	644
 INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
 PROG=		$(PYTHON) build/bin/pygettext.py
 
-.SUFFIXES:	.po .mo
-.po.mo:
-	-$(MSGFMT) -o $@ $<
+$(BUILDDIR)/%/LC_MESSAGES/mailman.mo: $(BUILDDIR)/%/LC_MESSAGES/mailman.po
+	$(MSGFMT) -o $@ $<
 
 .NOTPARALLEL:
 
@@ -108,28 +108,37 @@ doinstall: .converted.stamp mofiles
 	done
 	@for d in $(LANGUAGES); \
 	do \
-	    po=$(srcdir)/$$d/LC_MESSAGES/mailman.po; \
-	    mo=$(srcdir)/$$d/LC_MESSAGES/mailman.mo; \
+	    po=$(BUILDDIR)/$$d/LC_MESSAGES/mailman.po; \
+	    mo=$(BUILDDIR)/$$d/LC_MESSAGES/mailman.mo; \
 	    dir=$(DESTDIR)$(prefix)/messages/$$d/LC_MESSAGES; \
 	    $(INSTALL) -m $(FILEMODE) $$po $$dir; \
  	    $(INSTALL) -m $(FILEMODE) $$mo $$dir; \
 	done
 
-# Use a stamp file to track conversion, so it only happens once
+# Use a stamp file to track conversion, so it only happens once.
+# Convert a copy under build/ so tracked source .po files are not modified.
 .converted.stamp: $(POFILES)
-	$(PYTHON) ../scripts/convert_to_utf8 -d .
+	rm -rf $(BUILDDIR)
+	for d in $(LANGUAGES); \
+	do \
+	    dir=$(BUILDDIR)/$$d/LC_MESSAGES; \
+	    $(srcdir)/../mkinstalldirs $$dir; \
+	    cp $(srcdir)/$$d/LC_MESSAGES/mailman.po $$dir/; \
+	done
+	$(PYTHON) ../scripts/convert_to_utf8 -d $(BUILDDIR)
 	touch .converted.stamp
 
 # Ensure .po files are merged with mailman.pot before conversion
 # This depends on the .po files being up to date with mailman.pot
 convertpofiles: $(POFILES) .converted.stamp
 
-mofiles: $(MOFILES)
+mofiles: .converted.stamp $(MOFILES)
 
 finish:
 
 clean:
 	-rm -f */LC_MESSAGES/mailman.mo .converted.stamp
+	-rm -rf $(BUILDDIR)
 
 fileclean:
 	-rm -f marked.files docstring.files

templates/Makefile.in

@@ -40,6 +40,7 @@ DEFS=   	@DEFS@
 OPT=		@OPT@
 CFLAGS=		$(OPT) $(DEFS)
 TEMPLATEDIR= 	$(prefix)/templates
+BUILDDIR=	../build/templates
 
 SHELL=		/bin/sh
 
@@ -60,9 +61,26 @@ INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
 
 all: converttemplates
 
-# Use a stamp file to track conversion, so it only happens once
+# Use a stamp file to track conversion, so it only happens once.
+# Convert a copy under build/ so tracked source templates are not modified.
 .converted.stamp:
-	$(PYTHON) ../scripts/convert_to_utf8 -d .
+	rm -rf $(BUILDDIR)
+	mkdir -p $(BUILDDIR)
+	for d in $(LANGUAGES); \
+	do \
+	    if test -d $(srcdir)/$$d; \
+	    then \
+		mkdir -p $(BUILDDIR)/$$d; \
+		for f in $(srcdir)/$$d/*.html $(srcdir)/$$d/*.txt; \
+		do \
+		    if test -f $$f; \
+		    then \
+			cp $$f $(BUILDDIR)/$$d/; \
+		    fi; \
+		done; \
+	    fi; \
+	done
+	$(PYTHON) ../scripts/convert_to_utf8 -d $(BUILDDIR)
 	touch .converted.stamp
 
 converttemplates: .converted.stamp
@@ -71,16 +89,20 @@ install: .converted.stamp
 	for d in $(LANGUAGES); \
 	do \
 	    $(srcdir)/../mkinstalldirs $(DESTDIR)$(TEMPLATEDIR)/$$d; \
-	    for f in $(srcdir)/$$d/*.html $(srcdir)/$$d/*.txt; \
+	    for f in $(BUILDDIR)/$$d/*.html $(BUILDDIR)/$$d/*.txt; \
 	    do \
-	    	$(INSTALL) -m $(FILEMODE) $$f $(DESTDIR)$(TEMPLATEDIR)/$$d; \
+		if test -f $$f; \
+		then \
+	    	    $(INSTALL) -m $(FILEMODE) $$f $(DESTDIR)$(TEMPLATEDIR)/$$d; \
+		fi; \
 	    done; \
 	done
 
 finish:
 
 clean:
 	-rm -f .converted.stamp
+	-rm -rf $(BUILDDIR)
 
 distclean: clean
 	-rm -f Makefile