X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=po%2Fautomake.mk;h=0e83674ca8da9c40c270ffe63e9e8da93513fcfb;hb=8b69be6141514e5773129d715cc7876d7e0dc013;hp=594d35e14ffd51880dd2e7ece0898fe17b474bbc;hpb=01823fe3340ba68bc8a1a938ad00c57fde72cb96;p=pspp

diff --git a/po/automake.mk b/po/automake.mk
index 594d35e14f..0e83674ca8 100644
--- a/po/automake.mk
+++ b/po/automake.mk
@@ -57,16 +57,17 @@ XGETTEXT_OPTIONS = \
 ALL_TRANSLATABLE_FILES = \
 	$(TRANSLATABLE_FILES) \
 	$(UI_FILES) \
-	src/ui/gui/org.fsf.pspp.metainfo.xml.in \
-	src/ui/gui/org.fsf.pspp.desktop.in
+	doc/org.fsf.pspp.metainfo.xml.in \
+	doc/org.fsf.pspp.desktop.in
 
 $(POTFILE): $(ALL_TRANSLATABLE_FILES) Makefile
 	@$(MKDIR_P) po
 	$(AM_V_GEN)$(XGETTEXT) $(XGETTEXT_OPTIONS) $(TRANSLATABLE_FILES) --language=C --keyword=_ --keyword=N_ -o $@,tmp
-	$(AM_V_at)$(XGETTEXT) $(XGETTEXT_OPTIONS) -j $(UI_FILES) --language=Glade -o $@,tmp
-	$(AM_V_at)$(XGETTEXT) $(XGETTEXT_OPTIONS) --its=$(top_srcdir)/po/metainfo.its -j src/ui/gui/org.fsf.pspp.metainfo.xml.in -o $@,tmp
-	$(AM_V_at)$(XGETTEXT) $(XGETTEXT_OPTIONS) -j src/ui/gui/org.fsf.pspp.desktop.in -o $@,tmp
+	$(AM_V_at)test -z "$(UI_FILES)" || $(XGETTEXT) $(XGETTEXT_OPTIONS) -j $(UI_FILES) --language=Glade -o $@,tmp
+	$(AM_V_at)$(XGETTEXT) $(XGETTEXT_OPTIONS) -j doc/org.fsf.pspp.metainfo.xml.in -o $@,tmp
+	$(AM_V_at)$(XGETTEXT) $(XGETTEXT_OPTIONS) -j doc/org.fsf.pspp.desktop.in -o $@,tmp
 	$(AM_V_at)$(SED) -e '/^"POT-Creation-Date: .*/d' $@,tmp > $@
+	rm -f $@,tmp
 
 $(LOCALPOFILES) $(POFILES): $(POTFILE)
 	$(AM_V_GEN)$(MSGMERGE) --previous --quiet $(top_srcdir)/$@ $? -o $@,tmp
@@ -76,7 +77,7 @@ $(LOCALPOFILES) $(POFILES): $(POTFILE)
 	fi ;
 	$(AM_V_at)$(SED) -e '/^"POT-Creation-Date: /d' $@,tmp > $@,tmp2
 	$(RM) $@,tmp
-	$(MSGFMT) -c $@,tmp2
+	$(MSGFMT) -c $@,tmp2 -o - > /dev/null
 	mv $@,tmp2 $@
 
 SUFFIXES += .po .gmo
@@ -107,7 +108,6 @@ EXTRA_DIST += \
 	$(LOCALPOFILES) \
 	$(POFILES) \
 	$(POTFILE) \
-	po/metainfo.its \
 	po/LINGUAS \
 	po/ChangeLog \
 	po/cs.po,aux
@@ -126,12 +126,14 @@ CLEAN_LOCAL += po_CLEAN
 # Download the po files from http://translationproject.org
 # The final action to this rule is to remove the .pot file.  This
 # is because the po files must be re-merged against an updated version of it.
-.PHONY: po-update
-po-update: $(POFILES)
-	for p in $^; do \
-		wget --recursive --level=1 --accept=po --no-directories --no-use-server-timestamps \
-		--directory-prefix=po -O ${top_srcdir}/$$p,tmp \
+#
+# You can update just one .po file with, e.g.:
+# make po-update POFILES=po/uk.po
+PHONY += po-update
+po-update:
+	for p in $(POFILES); do \
+		wget --no-use-server-timestamps -O $$p,tmp \
 		https://translationproject.org/latest/pspp/`basename $$p` ; \
-		mv ${top_srcdir}/$$p,tmp ${top_srcdir}/$$p; \
+		mv $$p,tmp ${top_srcdir}/$$p; \
 	done
 	$(RM) $(POTFILE)