From: Bruno Haible Date: Sun, 13 Oct 2024 20:36:41 +0000 (+0200) Subject: po: Assume a 'sed' that supports '#' for introducing comments. X-Git-Tag: v0.23~55 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fe3b543701e51c9cfd66b96c0e9100b1a9f36e1a;p=thirdparty%2Fgettext.git po: Assume a 'sed' that supports '#' for introducing comments. This is standardized in POSIX since POSIX:2001 (= SUSv3). It is supported on all platforms that I could test: GNU, macOS 10.5, FreeBSD 5, NetBSD 7, OpenBSD 6, AIX 7, Solaris 10 and 11, busybox (2019). * gettext-runtime/po/insert-header.sed: Renamed from gettext-runtime/po/insert-header.sin. * gettext-runtime/po/Rules-quot (DISTFILES.common.extra1): Update. (en@quot.insert-header, en@boldquot.insert-header): Use insert-header.sed instead of insert-header.sin. * autogen.sh: Update. * Makefile.am (distcheck-hook): Update. * gettext-tools/examples/hello-*/autogen.sh: Update. * gettext-tools/doc/gettext.texi (po/LINGUAS): Update. --- diff --git a/.gitignore b/.gitignore index 6454ba76c..cf198e23e 100644 --- a/.gitignore +++ b/.gitignore @@ -410,7 +410,7 @@ /gettext-tools/po/boldquot.sed /gettext-tools/po/en@boldquot.header /gettext-tools/po/en@quot.header -/gettext-tools/po/insert-header.sin +/gettext-tools/po/insert-header.sed /gettext-tools/po/quot.sed /gettext-tools/po/remove-potcdate.sin diff --git a/Makefile.am b/Makefile.am index ceddff526..3396d202f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -70,7 +70,7 @@ distcheck-hook: cmp -s $(srcdir)/gettext-runtime/po/quot.sed $(srcdir)/gettext-tools/po/quot.sed cmp -s $(srcdir)/gettext-runtime/po/en@quot.header $(srcdir)/gettext-tools/po/en@quot.header cmp -s $(srcdir)/gettext-runtime/po/en@boldquot.header $(srcdir)/gettext-tools/po/en@boldquot.header - cmp -s $(srcdir)/gettext-runtime/po/insert-header.sin $(srcdir)/gettext-tools/po/insert-header.sin + cmp -s $(srcdir)/gettext-runtime/po/insert-header.sed $(srcdir)/gettext-tools/po/insert-header.sed cmp -s $(srcdir)/gettext-runtime/po/remove-potcdate.sin $(srcdir)/gettext-tools/po/remove-potcdate.sin cmp -s $(srcdir)/gettext-runtime/po/remove-potcdate.sin $(srcdir)/gettext-tools/examples/po/remove-potcdate.sin cmp -s $(srcdir)/gettext-runtime/m4/build-to-host.m4 $(srcdir)/gettext-tools/gnulib-m4/build-to-host.m4 diff --git a/autogen.sh b/autogen.sh index 1641d74ef..5cbdd0da7 100755 --- a/autogen.sh +++ b/autogen.sh @@ -540,7 +540,7 @@ cp -p gettext-runtime/po/boldquot.sed gettext-tools/po/boldquot.sed cp -p gettext-runtime/po/quot.sed gettext-tools/po/quot.sed cp -p gettext-runtime/po/en@quot.header gettext-tools/po/en@quot.header cp -p gettext-runtime/po/en@boldquot.header gettext-tools/po/en@boldquot.header -cp -p gettext-runtime/po/insert-header.sin gettext-tools/po/insert-header.sin +cp -p gettext-runtime/po/insert-header.sed gettext-tools/po/insert-header.sed cp -p gettext-runtime/po/remove-potcdate.sin gettext-tools/po/remove-potcdate.sin echo "$0: generating configure in gettext-tools..." diff --git a/gettext-runtime/po/Rules-quot b/gettext-runtime/po/Rules-quot index 18c024bf4..da987504d 100644 --- a/gettext-runtime/po/Rules-quot +++ b/gettext-runtime/po/Rules-quot @@ -1,11 +1,11 @@ # Special Makefile rules for English message catalogs with quotation marks. # -# Copyright (C) 2001-2017 Free Software Foundation, Inc. +# Copyright (C) 2001-2024 Free Software Foundation, Inc. # This file, Rules-quot, and its auxiliary files (listed under # DISTFILES.common.extra1) are free software; the Free Software Foundation # gives unlimited permission to use, copy, distribute, and modify them. -DISTFILES.common.extra1 = quot.sed boldquot.sed en@quot.header en@boldquot.header insert-header.sin Rules-quot +DISTFILES.common.extra1 = quot.sed boldquot.sed en@quot.header en@boldquot.header insert-header.sed Rules-quot .SUFFIXES: .insert-header .po-update-en @@ -51,11 +51,11 @@ en@boldquot.po-update: en@boldquot.po-update-en rm -f $$tmpdir/$$lang.new.po; \ fi -en@quot.insert-header: insert-header.sin - sed -e '/^#/d' -e 's/HEADER/en@quot.header/g' $(srcdir)/insert-header.sin > en@quot.insert-header +en@quot.insert-header: insert-header.sed + sed -e 's/HEADER/en@quot.header/g' $(srcdir)/insert-header.sed > en@quot.insert-header -en@boldquot.insert-header: insert-header.sin - sed -e '/^#/d' -e 's/HEADER/en@boldquot.header/g' $(srcdir)/insert-header.sin > en@boldquot.insert-header +en@boldquot.insert-header: insert-header.sed + sed -e 's/HEADER/en@boldquot.header/g' $(srcdir)/insert-header.sed > en@boldquot.insert-header mostlyclean: mostlyclean-quot mostlyclean-quot: diff --git a/gettext-runtime/po/insert-header.sin b/gettext-runtime/po/insert-header.sed similarity index 100% rename from gettext-runtime/po/insert-header.sin rename to gettext-runtime/po/insert-header.sed diff --git a/gettext-tools/doc/gettext.texi b/gettext-tools/doc/gettext.texi index c62071bd9..a2cbb3c11 100644 --- a/gettext-tools/doc/gettext.texi +++ b/gettext-tools/doc/gettext.texi @@ -8909,7 +8909,7 @@ a terminal emulator which supports the VT100 escape sequences (such as These extra message catalogs @samp{en@@quot} and @samp{en@@boldquot} are constructed automatically, not by translators; to support them, you need the files @file{Rules-quot}, @file{quot.sed}, @file{boldquot.sed}, -@file{en@@quot.header}, @file{en@@boldquot.header}, @file{insert-header.sin} +@file{en@@quot.header}, @file{en@@boldquot.header}, @file{insert-header.sed} in the @file{po/} directory. You can copy them from GNU gettext's @file{po/} directory; they are also installed by running @code{gettextize}. diff --git a/gettext-tools/examples/hello-c++-gnome/autogen.sh b/gettext-tools/examples/hello-c++-gnome/autogen.sh index 7fc228379..cf1a97eec 100755 --- a/gettext-tools/examples/hello-c++-gnome/autogen.sh +++ b/gettext-tools/examples/hello-c++-gnome/autogen.sh @@ -10,7 +10,7 @@ rm po/Rules-quot rm po/boldquot.sed rm po/en@boldquot.header rm po/en@quot.header -rm po/insert-header.sin +rm po/insert-header.sed rm po/quot.sed aclocal -I m4 diff --git a/gettext-tools/examples/hello-c++-kde/autogen.sh b/gettext-tools/examples/hello-c++-kde/autogen.sh index ded134bce..75460adc8 100755 --- a/gettext-tools/examples/hello-c++-kde/autogen.sh +++ b/gettext-tools/examples/hello-c++-kde/autogen.sh @@ -33,7 +33,7 @@ rm po/Rules-quot rm po/boldquot.sed rm po/en@boldquot.header rm po/en@quot.header -rm po/insert-header.sin +rm po/insert-header.sed rm po/quot.sed sh admin/cvs.sh cvs diff --git a/gettext-tools/examples/hello-c++/autogen.sh b/gettext-tools/examples/hello-c++/autogen.sh index 0332a9b21..21904ca9f 100755 --- a/gettext-tools/examples/hello-c++/autogen.sh +++ b/gettext-tools/examples/hello-c++/autogen.sh @@ -31,7 +31,7 @@ rm po/Rules-quot rm po/boldquot.sed rm po/en@boldquot.header rm po/en@quot.header -rm po/insert-header.sin +rm po/insert-header.sed rm po/quot.sed aclocal -I m4 diff --git a/gettext-tools/examples/hello-c++20/autogen.sh b/gettext-tools/examples/hello-c++20/autogen.sh index 0332a9b21..21904ca9f 100755 --- a/gettext-tools/examples/hello-c++20/autogen.sh +++ b/gettext-tools/examples/hello-c++20/autogen.sh @@ -31,7 +31,7 @@ rm po/Rules-quot rm po/boldquot.sed rm po/en@boldquot.header rm po/en@quot.header -rm po/insert-header.sin +rm po/insert-header.sed rm po/quot.sed aclocal -I m4 diff --git a/gettext-tools/examples/hello-c-gnome/autogen.sh b/gettext-tools/examples/hello-c-gnome/autogen.sh index 7fc228379..cf1a97eec 100755 --- a/gettext-tools/examples/hello-c-gnome/autogen.sh +++ b/gettext-tools/examples/hello-c-gnome/autogen.sh @@ -10,7 +10,7 @@ rm po/Rules-quot rm po/boldquot.sed rm po/en@boldquot.header rm po/en@quot.header -rm po/insert-header.sin +rm po/insert-header.sed rm po/quot.sed aclocal -I m4 diff --git a/gettext-tools/examples/hello-c-gnome3/autogen.sh b/gettext-tools/examples/hello-c-gnome3/autogen.sh index 7fc228379..cf1a97eec 100755 --- a/gettext-tools/examples/hello-c-gnome3/autogen.sh +++ b/gettext-tools/examples/hello-c-gnome3/autogen.sh @@ -10,7 +10,7 @@ rm po/Rules-quot rm po/boldquot.sed rm po/en@boldquot.header rm po/en@quot.header -rm po/insert-header.sin +rm po/insert-header.sed rm po/quot.sed aclocal -I m4 diff --git a/gettext-tools/examples/hello-c/autogen.sh b/gettext-tools/examples/hello-c/autogen.sh index 78b150395..1ae12f1be 100755 --- a/gettext-tools/examples/hello-c/autogen.sh +++ b/gettext-tools/examples/hello-c/autogen.sh @@ -31,7 +31,7 @@ rm po/Rules-quot rm po/boldquot.sed rm po/en@boldquot.header rm po/en@quot.header -rm po/insert-header.sin +rm po/insert-header.sed rm po/quot.sed aclocal -I m4 diff --git a/gettext-tools/examples/hello-objc-gnome/autogen.sh b/gettext-tools/examples/hello-objc-gnome/autogen.sh index 7fc228379..cf1a97eec 100755 --- a/gettext-tools/examples/hello-objc-gnome/autogen.sh +++ b/gettext-tools/examples/hello-objc-gnome/autogen.sh @@ -10,7 +10,7 @@ rm po/Rules-quot rm po/boldquot.sed rm po/en@boldquot.header rm po/en@quot.header -rm po/insert-header.sin +rm po/insert-header.sed rm po/quot.sed aclocal -I m4 diff --git a/gettext-tools/examples/hello-objc/autogen.sh b/gettext-tools/examples/hello-objc/autogen.sh index 78b150395..1ae12f1be 100755 --- a/gettext-tools/examples/hello-objc/autogen.sh +++ b/gettext-tools/examples/hello-objc/autogen.sh @@ -31,7 +31,7 @@ rm po/Rules-quot rm po/boldquot.sed rm po/en@boldquot.header rm po/en@quot.header -rm po/insert-header.sin +rm po/insert-header.sed rm po/quot.sed aclocal -I m4