X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=po%2Fautomake.mk;h=e0276a30916cd617b5cc99a43580258c09a3bc18;hb=dfe6c9dc498c67115aa489adeb8c7a74a5e5b0ad;hp=a36081c433f4a70091e48c08c7ee656024cab3c7;hpb=553dd6fd34f6ac129d51cf4736f89e349b97e16c;p=pspp

diff --git a/po/automake.mk b/po/automake.mk
index a36081c433..e0276a3091 100644
--- a/po/automake.mk
+++ b/po/automake.mk
@@ -4,7 +4,7 @@ XGETTEXT=xgettext
 MSGMERGE=msgmerge
 MSGFMT=msgfmt
 
-POFILES=po/en_GB.po po/nl.po po/pt_BR.po
+POFILES=po/ca.po po/en_GB.po po/es.po po/lt.po po/nl.po po/pt_BR.po
 
 POTFILE=po/$(DOMAIN).pot
 
@@ -15,6 +15,7 @@ XGETTEXT_OPTIONS = \
 	--package-name=$(PACKAGE) \
 	--package-version=$(VERSION) \
 	--msgid-bugs-address=$(MSGID_BUGS_ADDRESS) \
+        --from-code=UTF-8 \
 	--add-comments='TRANSLATORS:'
 
 $(POTFILE): $(TRANSLATABLE_FILES) $(UI_FILES)
@@ -24,7 +25,7 @@ $(POTFILE): $(TRANSLATABLE_FILES) $(UI_FILES)
 
 
 $(POFILES): $(POTFILE)
-	$(MSGMERGE) $(top_srcdir)/$@ $< -o $@
+	$(MSGMERGE) $(top_srcdir)/$@ $? -o $@
 
 
 SUFFIXES += .po .gmo
@@ -40,7 +41,8 @@ ALL_LOCAL += $(GMOFILES)
 install-data-hook: $(GMOFILES)
 	for f in $(GMOFILES); do \
 	  lang=`echo $$f | sed -e 's%po/\(.*\)\.gmo%\1%' ` ; \
-	  $(INSTALL) -D $$f $(DESTDIR)$(prefix)/share/locale/$$lang/LC_MESSAGES/$(DOMAIN).mo ; \
+	  $(MKDIR_P) $(DESTDIR)$(prefix)/share/locale/$$lang/LC_MESSAGES; \
+	  $(INSTALL_DATA) $$f $(DESTDIR)$(prefix)/share/locale/$$lang/LC_MESSAGES/$(DOMAIN).mo ; \
 	done
 
 uninstall-hook:
@@ -52,5 +54,13 @@ uninstall-hook:
 
 EXTRA_DIST += $(POFILES) $(POTFILE)
 
-CLEANFILES += $(POFILES) $(GMOFILES) $(POTFILE)
+CLEANFILES += $(GMOFILES) $(POTFILE)
 
+# Clean $(POFILES) from build directory but not if that's the same as
+# the source directory.
+po_CLEAN:
+	@if test "$(srcdir)" != .; then \
+		echo rm -f $(POFILES); \
+		rm -f $(POFILES); \
+	fi
+CLEAN_LOCAL += po_CLEAN