X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/3d27dac8098957024b8e4c6ee815536fe81e8d18..0a046b842b997203c3b8ff646610ec181bc96e34:/po/Makefile

diff --git a/po/Makefile b/po/Makefile
index d67c3a4ff..961763d05 100644
--- a/po/Makefile
+++ b/po/Makefile
@@ -5,26 +5,16 @@ POTFILES=$(sort $(shell find ../IkiWiki -type f -name \*.pm)) \
 POFILES=$(wildcard *.po)
 MOFILES=$(POFILES:.po=.mo)
 
-all: ikiwiki.pot mo ../underlays/locale
+all: ikiwiki.pot mo
 
 mo: $(MOFILES)
 
 install: all
-	# Normal mo files for program translation.
 	for file in $(MOFILES); do \
 		lang=`echo $$file | sed 's/\.mo//'`; \
 		install -d $(DESTDIR)$(PREFIX)/share/locale/$$lang/LC_MESSAGES/; \
 		install -m 0644 $$file $(DESTDIR)$(PREFIX)/share/locale/$$lang/LC_MESSAGES/ikiwiki.mo; \
 	done
-	
-	# Underlay translation via po files that go in special per-language
-	# underlays.
-	for file in `cd underlays && find . -type f -name \*.po`; do \
-		lang=`echo $$file | sed -e 's/.po$$//' -e 's/.*\\.//'`; \
-		dir=`dirname "$(DESTDIR)$(PREFIX)/share/ikiwiki/po/$$lang/$$file"`; \
-		install -d $$dir; \
-		install -m 0644 underlays/$$file $$dir; \
-	done
 
 ikiwiki.pot: $(POTFILES)
 	@if perl -e '($$ver)=`xgettext -V | head -n 1`=~/.*\s+([0-9]+\.[0-9]+)/; die "gettext $$ver too old, not updating the pot file\n" if $$ver < 0.16'; then \
@@ -33,24 +23,25 @@ ikiwiki.pot: $(POTFILES)
 	fi
 
 clean:
-	rm -f $(MOFILES) messages messages.mo *_stamp
-	rm -rf html underlays/.ikiwiki ../underlays/locale
-	find underlays -name \*.mdwn -or -name \*.pot | xargs rm -f
+	rm -f $(MOFILES) messages messages.mo
 
 %.mo: %.po
-	msgfmt -o $@ $<
+	@if ! msgfmt -o $@ $<; then echo "unable to run msgfmt"; fi
 
 %.po: ikiwiki.pot
 	@echo -n "Merging ikiwiki.pot and $@"
-	@msgmerge $@ ikiwiki.pot -o $@.new 2>&1
-# Typically all that changes was a date or line number. I'd prefer not to
+# Typically all that changes is a date or line number. I'd prefer not to
 # commit such changes, so detect and ignore them.
-	@if [ "`diff $@ $@.new | grep '[<>]' | grep -v '[<>] #:' | wc -l`" -ne 2 ]; then \
-		mv -f $@.new $@; \
+	@if ! msgmerge $@ ikiwiki.pot -o $@.new 2>&1; then \
+		echo "unable to run msgmerge"; \
 	else \
-		rm -f $@.new; \
+		if [ "`diff $@ $@.new | grep '[<>]' | grep -v '[<>] #:' | wc -l`" -ne 2 ]; then \
+			mv -f $@.new $@; \
+		else \
+			rm -f $@.new; \
+		fi; \
+		msgfmt --statistics $@ 2>&1; \
 	fi
-	@msgfmt --statistics $@ 2>&1
 
 check:
 	@for file in $(POFILES); do \
@@ -58,34 +49,3 @@ check:
 		printf "$$lang: "; \
 		msgfmt -o /dev/null -c -v --statistics $$lang.po;\
 	done
-
-underlays_copy_stamp:
-	# copy all the files we want to translate into a srcdir
-	for file in `cd ..; find underlays -follow -name \*.mdwn`; do \
-		install -d $$(dirname $$file); \
-		cp -aL ../$$file $$file 2>/dev/null || \
-		install -m 644 ../$$file $$file; \
-	done
-	install -d underlays/directives/ikiwiki/directive
-	for file in `cd ..; find doc/ikiwiki/directive/ -maxdepth 1 -type f`; do \
-		cp -a ../$$file underlays/directives/ikiwiki/directive ||  \
-		install -m 644 ../$$file underlays/directives/ikiwiki/directive; \
-	done
-	install -d underlays/empty
-	touch $@
-
-underlays: ../ikiwiki.out underlays_copy_stamp
-	../ikiwiki.out -libdir .. -setup underlay.setup -refresh
-
-../ikiwiki.out: ../Makefile
-	make -C .. ikiwiki.out
-
-../Makefile: ../Makefile.PL
-	cd .. && ./Makefile.PL
-
-../underlays/locale: po2wiki_stamp
-po2wiki_stamp: po2wiki underlays_copy_stamp
-	PERL5LIB=.. ./po2wiki underlay.setup
-	touch $@
-
-.PHONY: underlays