X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=po%2Fautomake.mk;h=81c659c14504175ebeb0e2f61a084e96f38c5076;hb=f6c6ee97c412e47eb1c7c30adc224e93b6c1586a;hp=0e83674ca8da9c40c270ffe63e9e8da93513fcfb;hpb=8fedd452487aaee9ed4be69927f6895c9623e7ce;p=pspp

diff --git a/po/automake.mk b/po/automake.mk
index 0e83674ca8..81c659c145 100644
--- a/po/automake.mk
+++ b/po/automake.mk
@@ -1,5 +1,5 @@
 # PSPP - a program for statistical analysis.
-# Copyright (C) 2017, 2020 Free Software Foundation, Inc.
+# Copyright (C) 2017, 2020, 2021 Free Software Foundation, Inc.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -43,7 +43,7 @@ LOCALPOFILES = po/cs.po
 
 POTFILE=po/$(DOMAIN).pot
 
-TRANSLATABLE_FILES = $(DIST_SOURCES) $(all_q_sources)
+TRANSLATABLE_FILES = $(DIST_SOURCES)
 
 XGETTEXT_OPTIONS = \
 	--copyright-holder="$(COPYRIGHT_HOLDER)" \
@@ -57,17 +57,16 @@ XGETTEXT_OPTIONS = \
 ALL_TRANSLATABLE_FILES = \
 	$(TRANSLATABLE_FILES) \
 	$(UI_FILES) \
-	doc/org.fsf.pspp.metainfo.xml.in \
-	doc/org.fsf.pspp.desktop.in
+	doc/org.gnu.pspp.metainfo.xml.in \
+	doc/org.gnu.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)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
+	$(AM_V_at)$(XGETTEXT) $(XGETTEXT_OPTIONS) -j doc/org.gnu.pspp.metainfo.xml.in -o $@,tmp
+	$(AM_V_at)$(XGETTEXT) $(XGETTEXT_OPTIONS) -j doc/org.gnu.pspp.desktop.in -o $@,tmp
+	$(AM_V_at)mv $@,tmp $@
 
 $(LOCALPOFILES) $(POFILES): $(POTFILE)
 	$(AM_V_GEN)$(MSGMERGE) --previous --quiet $(top_srcdir)/$@ $? -o $@,tmp
@@ -75,10 +74,8 @@ $(LOCALPOFILES) $(POFILES): $(POTFILE)
 		touch $@,tmp ; \
 		msgcat --use-first $(top_srcdir)/$@,aux $@,tmp -o $@,tmp; \
 	fi ;
-	$(AM_V_at)$(SED) -e '/^"POT-Creation-Date: /d' $@,tmp > $@,tmp2
-	$(RM) $@,tmp
-	$(MSGFMT) -c $@,tmp2 -o - > /dev/null
-	mv $@,tmp2 $@
+	$(MSGFMT) -c $@,tmp -o - > /dev/null
+	mv $@,tmp $@
 
 SUFFIXES += .po .gmo
 .po.gmo:
@@ -97,12 +94,13 @@ install-data-hook: $(GMOFILES)
 	  $(INSTALL_DATA) $$f $(DESTDIR)$(prefix)/share/locale/$$lang/LC_MESSAGES/$(DOMAIN).mo ; \
 	done
 
-uninstall-hook:
+uninstall-hook: uninstall-gmofiles
+uninstall-gmofiles:
 	for f in $(GMOFILES); do \
 	  lang=`echo $$f | $(SED) -e 's%po/\(.*\)\.gmo%\1%' ` ; \
 	  rm -f $(DESTDIR)$(prefix)/share/locale/$$lang/LC_MESSAGES/$(DOMAIN).mo ; \
 	done
-
+.PHONY: uninstall-gmofiles
 
 EXTRA_DIST += \
 	$(LOCALPOFILES) \