[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
trans-coord/gnun/server/gnun GNUmakefile ChangeLog
From: |
Pavel Kharitonov |
Subject: |
trans-coord/gnun/server/gnun GNUmakefile ChangeLog |
Date: |
Sun, 03 Jun 2012 07:15:14 +0000 |
CVSROOT: /sources/trans-coord
Module name: trans-coord
Changes by: Pavel Kharitonov <ineiev> 12/06/03 07:15:14
Modified files:
gnun/server/gnun: GNUmakefile ChangeLog
Log message:
* GNUmakefile ($(template-dir)/po/whatsnew.pot): Consider
POTs with different `Language' and `PO-Revision-Date' fields
equivalent.
($(template-dir)/po/whatsnew.%.html): Workaround circular
dependency caused by a feature of `update-po'.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/GNUmakefile?cvsroot=trans-coord&r1=1.127&r2=1.128
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/ChangeLog?cvsroot=trans-coord&r1=1.273&r2=1.274
Patches:
Index: GNUmakefile
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/GNUmakefile,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -b -r1.127 -r1.128
--- GNUmakefile 29 May 2012 16:05:00 -0000 1.127
+++ GNUmakefile 3 Jun 2012 07:15:14 -0000 1.128
@@ -812,7 +812,8 @@
--master $< --master $(template-dir)/whatsnew.include --po
address@hidden
if ([ ! -f $@ ] \
|| [ "`diff -U 0 $@ address@hidden | $(GREP) -v "^\(---\|+++\|@@\)" \
- | $(GREP) -v '^[-+]\"POT-Creation-Date:' | wc -c`" -ne 0 ]); then \
+ | $(EGREP) -v '^[-+]"(POT-Creation-Date|PO-Revision-Date|Language):' \
+ | wc -c`" -ne 0 ]); then \
mv address@hidden $@; \
fi; \
touch $@
@@ -872,8 +873,18 @@
|| (touch $(template-dir)/$(@F) ; \
$(VCSSKIP) $(vcs) add $(template-dir)/$(@F))
# Unconditionally update the PO file; see the comment in `generate-html'.
+# Do _not_ touch the PO file if it doesn't change; this workaround is needed
+# because we are too lazy to provide a rule for the PO file.
+ cp -a $(template-dir)/po/whatsnew.$*.po \
+ $(template-dir)/po/whatsnew.$*.po1
$(call update-po,$(template-dir)/po/whatsnew.$*.po,\
$(template-dir)/po/whatsnew.pot,$*)
+ if diff $(template-dir)/po/whatsnew.$*.po \
+ $(template-dir)/po/whatsnew.$*.po1 > /dev/null; then \
+ touch --reference=$(template-dir)/po/whatsnew.$*.po1 \
+ $(template-dir)/po/whatsnew.$*.po; \
+ fi
+ $(RM) $(template-dir)/po/whatsnew.$*.po1
$(PO4A_TRANSLATE) $(PO4A-XHTMLFLAGS) $(PO4A-TRANSLATEFLAGS) \
--master $< --po $(template-dir)/po/whatsnew.$*.po \
--localized $(template-dir)/po/whatsnew.$*.m4
Index: ChangeLog
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/ChangeLog,v
retrieving revision 1.273
retrieving revision 1.274
diff -u -b -r1.273 -r1.274
--- ChangeLog 2 Jun 2012 09:54:28 -0000 1.273
+++ ChangeLog 3 Jun 2012 07:15:14 -0000 1.274
@@ -1,3 +1,11 @@
+2012-06-03 Pavel Kharitonov <address@hidden>
+
+ * GNUmakefile ($(template-dir)/po/whatsnew.pot): Consider
+ POTs with different `Language' and `PO-Revision-Date' fields
+ equivalent.
+ ($(template-dir)/po/whatsnew.%.html): Workaround circular
+ dependency caused by a feature of `update-po'.
+
2012-06-02 Pavel Kharitonov <address@hidden>
Document the shift in policies for trans-coord-discuss.
- trans-coord/gnun/server/gnun GNUmakefile ChangeLog,
Pavel Kharitonov <=