From 8b098ba7e7f700aa6d63cba47bf56e006cbaace9 Mon Sep 17 00:00:00 2001
From: Richard Jones <rjones@trick.home.annexia.org>
Date: Mon, 5 Oct 2009 15:10:08 +0100
Subject: [PATCH] Use msgfmt to generate *.mo files correctly.

---
 configure.ac   | 3 +++
 po/Makefile.in | 5 +++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 330bc3d..0186f5c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -78,6 +78,9 @@ AC_CHECK_PROG(HAVE_PERLDOC,perldoc,perldoc)
 dnl Check for recommended ocaml-gettext tool.
 AC_CHECK_PROG(OCAML_GETTEXT,ocaml-gettext,ocaml-gettext)
 
+dnl Check for msgfmt tool.
+AC_CHECK_PROG(MSGFMT,msgfmt,msgfmt)
+
 dnl Check for optional NSIS (for building a Windows installer).
 dnl XXX NSIS support is probably broken at the moment XXX
 AC_ARG_WITH([nsis],
diff --git a/po/Makefile.in b/po/Makefile.in
index 9398e2f..949c2d9 100644
--- a/po/Makefile.in
+++ b/po/Makefile.in
@@ -22,6 +22,8 @@ OCAML_GETTEXT_PACKAGE = virt-top
 LINGUAS		= $(shell cat LINGUAS)
 SOURCES		= POTFILES
 
+MSGFMT		= @MSGFMT@
+
 OCAML_GETTEXT	= @OCAML_GETTEXT@
 OCAML_GETTEXT_EXTRACT_OPTIONS =
 OCAML_GETTEXT_COMPILE_OPTIONS =
@@ -43,8 +45,7 @@ uninstall: uninstall-po
 clean:: clean-po
 
 %.mo: %.po
-	$(OCAML_GETTEXT) --action compile $(OCAML_GETTEXT_COMPILE_OPTIONS) \
-	--compile-output $@ $^
+	$(MSGFMT) -o $@ $^
 
 %.pot: $(SOURCES) $(shell cat $(SOURCES))
 	$(OCAML_GETTEXT) --action extract $(OCAML_GETTEXT_EXTRACT_OPTIONS) \
-- 
1.8.3.1