From: Bruno Haible Date: Sun, 13 Oct 2024 20:37:39 +0000 (+0200) Subject: po: Assume a 'sed' that supports '#' for introducing comments. X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=9a4589466bb18cb018ea6588e6836f034ee37a44;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/remove-potcdate.sed: Renamed from gettext-runtime/po/remove-potcdate.sin. * gettext-runtime/po/Makefile.in.in (DISTFILES.common): Update. (.SUFFIXES): Remove .sin. (.sin.sed): Remove rule. ($(DOMAIN).pot-update): Use remove-potcdate.sed in $(srcdir). (mostlyclean): Don't remove remove-potcdate.sed. * autogen.sh: Update. * Makefile.am (distcheck-hook): Update. * gettext-tools/examples/po/remove-potcdate.sed: Renamed from gettext-tools/examples/po/remove-potcdate.sin. * gettext-tools/examples/po/Makefile.am ($(DOMAIN).pot-update): Use remove-potcdate.sed in $(srcdir). (MOSTLYCLEANFILES): Don't add remove-potcdate.sed. (EXTRA_DIST): Update. * gettext-tools/examples/hello-*/po/Makefile.am ($(DOMAIN).pot-update): Use remove-potcdate.sed in $(srcdir). (MOSTLYCLEANFILES): Don't add remove-potcdate.sed. (EXTRA_DIST): Update. * gettext-tools/examples/hello-objc-gnustep/po/GNUmakefile ($(DOMAIN).pot-update): Remove dependency on remove-potcdate.sed. (internal-clean): Remove rule. * gettext-tools/examples/hello-*/autogen.sh: Update. * gettext-tools/examples/hello-*/autoclean.sh: Update. --- diff --git a/.gitignore b/.gitignore index cf198e23e..dd22d459a 100644 --- a/.gitignore +++ b/.gitignore @@ -412,7 +412,7 @@ /gettext-tools/po/en@quot.header /gettext-tools/po/insert-header.sed /gettext-tools/po/quot.sed -/gettext-tools/po/remove-potcdate.sin +/gettext-tools/po/remove-potcdate.sed # Files generated by the autotools: /aclocal.m4 @@ -858,7 +858,6 @@ core /gettext-runtime/intl/localename-table.h /gettext-runtime/libasprintf/autosprintf.h /gettext-runtime/po/??@*.insert-header -/gettext-runtime/po/remove-potcdate.sed /gettext-runtime/src/gettext.res /gettext-tools/doc/gettext.am /gettext-tools/doc/gettext.ams @@ -936,7 +935,6 @@ core /gettext-tools/libgrep/wctype.h /gettext-tools/libgrep/sys/types.h /gettext-tools/po/??@*.insert-header -/gettext-tools/po/remove-potcdate.sed /gettext-tools/src/gettext.res /gettext-tools/src/textstyle.h /gettext-tools/src/textstyle/stdbool.h @@ -945,7 +943,6 @@ core # Files generated by "make dist" and erased by "make mostlyclean" # (see MOSTLYCLEANFILES in Makefile.am): -/gettext-tools/examples/po/remove-potcdate.sed # ---------- "make all check" gets you here ---------- diff --git a/Makefile.am b/Makefile.am index 3396d202f..b95eade6d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -71,8 +71,8 @@ distcheck-hook: 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.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/po/remove-potcdate.sed $(srcdir)/gettext-tools/po/remove-potcdate.sed + cmp -s $(srcdir)/gettext-runtime/po/remove-potcdate.sed $(srcdir)/gettext-tools/examples/po/remove-potcdate.sed cmp -s $(srcdir)/gettext-runtime/m4/build-to-host.m4 $(srcdir)/gettext-tools/gnulib-m4/build-to-host.m4 cmp -s $(srcdir)/gettext-runtime/m4/gettext.m4 $(srcdir)/gettext-tools/gnulib-m4/gettext.m4 cmp -s $(srcdir)/gettext-runtime/man/help2man $(srcdir)/gettext-tools/man/help2man diff --git a/autogen.sh b/autogen.sh index 5cbdd0da7..f520cd746 100755 --- a/autogen.sh +++ b/autogen.sh @@ -541,7 +541,7 @@ 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.sed gettext-tools/po/insert-header.sed -cp -p gettext-runtime/po/remove-potcdate.sin gettext-tools/po/remove-potcdate.sin +cp -p gettext-runtime/po/remove-potcdate.sed gettext-tools/po/remove-potcdate.sed echo "$0: generating configure in gettext-tools..." cd gettext-tools diff --git a/gettext-runtime/po/Makefile.in.in b/gettext-runtime/po/Makefile.in.in index 5aecd780e..3df87a0f1 100644 --- a/gettext-runtime/po/Makefile.in.in +++ b/gettext-runtime/po/Makefile.in.in @@ -68,7 +68,7 @@ POFILES = @POFILES@ GMOFILES = @GMOFILES@ UPDATEPOFILES = @UPDATEPOFILES@ DUMMYPOFILES = @DUMMYPOFILES@ -DISTFILES.common = Makefile.in.in remove-potcdate.sin \ +DISTFILES.common = Makefile.in.in remove-potcdate.sed \ $(DISTFILES.common.extra1) $(DISTFILES.common.extra2) $(DISTFILES.common.extra3) DISTFILES = $(DISTFILES.common) Makevars POTFILES.in \ $(POFILES) $(GMOFILES) \ @@ -94,7 +94,7 @@ all: all-@USE_NLS@ .SUFFIXES: -.SUFFIXES: .po .gmo .sed .sin .nop .po-create .po-update +.SUFFIXES: .po .gmo .sed .nop .po-create .po-update # The .pot file, stamp-po, .po files, and .gmo files appear in release tarballs. # The GNU Coding Standards say in @@ -123,10 +123,6 @@ $(GMOFILES): $(srcdir)/$(DOMAIN).pot mv t-$${lang}.gmo $${lang}.gmo && \ rm -f $${lang}.1po -.sin.sed: - sed -e '/^#/d' $< > t-$@ - mv t-$@ $@ - all-yes: $(srcdir)/stamp-po all-no: @@ -171,7 +167,7 @@ $(srcdir)/stamp-po: $(srcdir)/$(DOMAIN).pot # The determination of whether the package xyz is a GNU one is based on the # heuristic whether some file in the top level directory mentions "GNU xyz". # If GNU 'find' is available, we avoid grepping through monster files. -$(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed +$(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in package_gnu="$(PACKAGE_GNU)"; \ test -n "$$package_gnu" || { \ if { if (LC_ALL=C find --version) 2>/dev/null | grep GNU >/dev/null; then \ @@ -223,8 +219,8 @@ $(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed || exit 1; \ fi; \ if test -f $(srcdir)/$(DOMAIN).pot; then \ - sed -f remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot > $(DOMAIN).1po && \ - sed -f remove-potcdate.sed < $(DOMAIN).po > $(DOMAIN).2po && \ + sed -f $(srcdir)/remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot > $(DOMAIN).1po && \ + sed -f $(srcdir)/remove-potcdate.sed < $(DOMAIN).po > $(DOMAIN).2po && \ if cmp $(DOMAIN).1po $(DOMAIN).2po >/dev/null 2>&1; then \ rm -f $(DOMAIN).1po $(DOMAIN).2po $(DOMAIN).po; \ else \ @@ -398,7 +394,6 @@ info dvi ps pdf html tags TAGS ctags CTAGS ID: install-dvi install-ps install-pdf install-html: mostlyclean: - rm -f remove-potcdate.sed rm -f $(srcdir)/stamp-poT rm -f core core.* $(DOMAIN).po $(DOMAIN).1po $(DOMAIN).2po *.new.po rm -fr *.o diff --git a/gettext-runtime/po/remove-potcdate.sin b/gettext-runtime/po/remove-potcdate.sed similarity index 100% rename from gettext-runtime/po/remove-potcdate.sin rename to gettext-runtime/po/remove-potcdate.sed diff --git a/gettext-tools/examples/hello-c++-gnome/autoclean.sh b/gettext-tools/examples/hello-c++-gnome/autoclean.sh index 9daa77ce0..9b8332fb2 100755 --- a/gettext-tools/examples/hello-c++-gnome/autoclean.sh +++ b/gettext-tools/examples/hello-c++-gnome/autoclean.sh @@ -22,7 +22,7 @@ rm -f m4/nls.m4 rm -f m4/po.m4 rm -f m4/progtest.m4 rm -f po/Makefile.in.in -rm -f po/remove-potcdate.sin +rm -f po/remove-potcdate.sed # Generated by aclocal. rm -f aclocal.m4 diff --git a/gettext-tools/examples/hello-c++-kde/autoclean.sh b/gettext-tools/examples/hello-c++-kde/autoclean.sh index 5f821c96a..99f538a4a 100755 --- a/gettext-tools/examples/hello-c++-kde/autoclean.sh +++ b/gettext-tools/examples/hello-c++-kde/autoclean.sh @@ -28,7 +28,7 @@ rm -f m4/nls.m4 rm -f m4/po.m4 rm -f m4/progtest.m4 rm -f po/Makefile.in.in -rm -f po/remove-potcdate.sin +rm -f po/remove-potcdate.sed rm -f admin/config.rpath # Generated through admin/cvs.sh. diff --git a/gettext-tools/examples/hello-c++-qt/autoclean.sh b/gettext-tools/examples/hello-c++-qt/autoclean.sh index f19191802..3294bb4d7 100755 --- a/gettext-tools/examples/hello-c++-qt/autoclean.sh +++ b/gettext-tools/examples/hello-c++-qt/autoclean.sh @@ -11,7 +11,7 @@ rm -rf autom4te.cache rm -f m4/nls.m4 rm -f m4/po.m4 rm -f m4/progtest.m4 -rm -f po/remove-potcdate.sin +rm -f po/remove-potcdate.sed # Generated by aclocal. rm -f aclocal.m4 diff --git a/gettext-tools/examples/hello-c++-qt/autogen.sh b/gettext-tools/examples/hello-c++-qt/autogen.sh index 11df112e1..3fa5efe45 100755 --- a/gettext-tools/examples/hello-c++-qt/autogen.sh +++ b/gettext-tools/examples/hello-c++-qt/autogen.sh @@ -26,7 +26,7 @@ fi cp -p ${ACLOCALDIR-$GETTEXT_TOPSRCDIR/gettext-runtime/m4}/nls.m4 m4/nls.m4 cp -p ${ACLOCALDIR-$GETTEXT_TOPSRCDIR/gettext-runtime/m4}/po.m4 m4/po.m4 cp -p ${ACLOCALDIR-$GETTEXT_TOPSRCDIR/gettext-runtime/m4}/progtest.m4 m4/progtest.m4 -cp -p ${GETTEXTSRCPODIR-$GETTEXT_TOPSRCDIR/gettext-runtime/po}/remove-potcdate.sin po/remove-potcdate.sin +cp -p ${GETTEXTSRCPODIR-$GETTEXT_TOPSRCDIR/gettext-runtime/po}/remove-potcdate.sed po/remove-potcdate.sed aclocal -I m4 diff --git a/gettext-tools/examples/hello-c++-qt/po/Makefile.am b/gettext-tools/examples/hello-c++-qt/po/Makefile.am index 8bf2d94eb..a7e1a2c20 100644 --- a/gettext-tools/examples/hello-c++-qt/po/Makefile.am +++ b/gettext-tools/examples/hello-c++-qt/po/Makefile.am @@ -157,7 +157,7 @@ $(srcdir)/stamp-po: $(srcdir)/$(DOMAIN).pot # The determination of whether the package xyz is a GNU one is based on the # heuristic whether some file in the top level directory mentions "GNU xyz". # If GNU 'find' is available, we avoid grepping through monster files. -$(DOMAIN).pot-update: $(POTFILES_DEPS) remove-potcdate.sed +$(DOMAIN).pot-update: $(POTFILES_DEPS) package_gnu="$(PACKAGE_GNU)"; \ test -n "$$package_gnu" || { \ if { if (LC_ALL=C find --version) 2>/dev/null | grep GNU >/dev/null; then \ @@ -209,8 +209,8 @@ $(DOMAIN).pot-update: $(POTFILES_DEPS) remove-potcdate.sed || exit 1; \ fi; \ if test -f $(srcdir)/$(DOMAIN).pot; then \ - sed -f remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot > $(DOMAIN).1po && \ - sed -f remove-potcdate.sed < $(DOMAIN).po > $(DOMAIN).2po && \ + sed -f $(srcdir)/remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot > $(DOMAIN).1po && \ + sed -f $(srcdir)/remove-potcdate.sed < $(DOMAIN).po > $(DOMAIN).2po && \ if cmp $(DOMAIN).1po $(DOMAIN).2po >/dev/null 2>&1; then \ rm -f $(DOMAIN).1po $(DOMAIN).2po $(DOMAIN).po; \ else \ @@ -281,14 +281,13 @@ uninstall-local-yes: html ID: MOSTLYCLEANFILES = -MOSTLYCLEANFILES += remove-potcdate.sed MOSTLYCLEANFILES += stamp-poT MOSTLYCLEANFILES += core core.* *.stackdump $(DOMAIN).po $(DOMAIN).1po $(DOMAIN).2po *.new.po MOSTLYCLEANFILES += *.o MAINTAINERCLEANFILES = $(DOMAIN).pot stamp-po $(QMFILES) -EXTRA_DIST = remove-potcdate.sin LINGUAS $(POFILES) $(QMFILES) +EXTRA_DIST = remove-potcdate.sed LINGUAS $(POFILES) $(QMFILES) # Hidden from automake, but really activated. Works around an automake-1.5 bug. #distdir: distdir1 diff --git a/gettext-tools/examples/hello-c++-wxwidgets/autoclean.sh b/gettext-tools/examples/hello-c++-wxwidgets/autoclean.sh index fad6d8b9a..79eb2ab8b 100755 --- a/gettext-tools/examples/hello-c++-wxwidgets/autoclean.sh +++ b/gettext-tools/examples/hello-c++-wxwidgets/autoclean.sh @@ -16,7 +16,7 @@ rm -f m4/lib-ld.m4 rm -f m4/lib-link.m4 rm -f m4/lib-prefix.m4 rm -f config.rpath -rm -f po/remove-potcdate.sin +rm -f po/remove-potcdate.sed # Generated by aclocal. rm -f aclocal.m4 diff --git a/gettext-tools/examples/hello-c++-wxwidgets/autogen.sh b/gettext-tools/examples/hello-c++-wxwidgets/autogen.sh index 4db00bab3..421a25ac8 100755 --- a/gettext-tools/examples/hello-c++-wxwidgets/autogen.sh +++ b/gettext-tools/examples/hello-c++-wxwidgets/autogen.sh @@ -31,7 +31,7 @@ cp -p ${ACLOCALDIR-$GETTEXT_TOPSRCDIR/gettext-runtime/gnulib-m4}/lib-ld.m4 m4/li cp -p ${ACLOCALDIR-$GETTEXT_TOPSRCDIR/gettext-runtime/gnulib-m4}/lib-link.m4 m4/lib-link.m4 cp -p ${ACLOCALDIR-$GETTEXT_TOPSRCDIR/gettext-runtime/gnulib-m4}/lib-prefix.m4 m4/lib-prefix.m4 cp -p ${GETTEXTSRCDIR-$GETTEXT_TOPSRCDIR/build-aux}/config.rpath config.rpath -cp -p ${GETTEXTSRCPODIR-$GETTEXT_TOPSRCDIR/gettext-runtime/po}/remove-potcdate.sin po/remove-potcdate.sin +cp -p ${GETTEXTSRCPODIR-$GETTEXT_TOPSRCDIR/gettext-runtime/po}/remove-potcdate.sed po/remove-potcdate.sed aclocal -I m4 diff --git a/gettext-tools/examples/hello-c++-wxwidgets/po/Makefile.am b/gettext-tools/examples/hello-c++-wxwidgets/po/Makefile.am index 204419ed0..2a8ac0597 100644 --- a/gettext-tools/examples/hello-c++-wxwidgets/po/Makefile.am +++ b/gettext-tools/examples/hello-c++-wxwidgets/po/Makefile.am @@ -160,7 +160,7 @@ $(srcdir)/stamp-po: $(srcdir)/$(DOMAIN).pot # The determination of whether the package xyz is a GNU one is based on the # heuristic whether some file in the top level directory mentions "GNU xyz". # If GNU 'find' is available, we avoid grepping through monster files. -$(DOMAIN).pot-update: $(POTFILES_DEPS) remove-potcdate.sed +$(DOMAIN).pot-update: $(POTFILES_DEPS) package_gnu="$(PACKAGE_GNU)"; \ test -n "$$package_gnu" || { \ if { if (LC_ALL=C find --version) 2>/dev/null | grep GNU >/dev/null; then \ @@ -212,8 +212,8 @@ $(DOMAIN).pot-update: $(POTFILES_DEPS) remove-potcdate.sed || exit 1; \ fi; \ if test -f $(srcdir)/$(DOMAIN).pot; then \ - sed -f remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot > $(DOMAIN).1po && \ - sed -f remove-potcdate.sed < $(DOMAIN).po > $(DOMAIN).2po && \ + sed -f $(srcdir)/remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot > $(DOMAIN).1po && \ + sed -f $(srcdir)/remove-potcdate.sed < $(DOMAIN).po > $(DOMAIN).2po && \ if cmp $(DOMAIN).1po $(DOMAIN).2po >/dev/null 2>&1; then \ rm -f $(DOMAIN).1po $(DOMAIN).2po $(DOMAIN).po; \ else \ @@ -346,14 +346,13 @@ uninstall-local-yes: html ID: MOSTLYCLEANFILES = -MOSTLYCLEANFILES += remove-potcdate.sed MOSTLYCLEANFILES += stamp-poT MOSTLYCLEANFILES += core core.* *.stackdump $(DOMAIN).po $(DOMAIN).1po $(DOMAIN).2po *.new.po MOSTLYCLEANFILES += *.o MAINTAINERCLEANFILES = $(DOMAIN).pot stamp-po $(GMOFILES) -EXTRA_DIST = remove-potcdate.sin LINGUAS $(POFILES) $(GMOFILES) +EXTRA_DIST = remove-potcdate.sed LINGUAS $(POFILES) $(GMOFILES) # Hidden from automake, but really activated. Works around an automake-1.5 bug. #distdir: distdir1 diff --git a/gettext-tools/examples/hello-c++/autoclean.sh b/gettext-tools/examples/hello-c++/autoclean.sh index d18688a59..1838e8d23 100755 --- a/gettext-tools/examples/hello-c++/autoclean.sh +++ b/gettext-tools/examples/hello-c++/autoclean.sh @@ -25,7 +25,7 @@ rm -f m4/nls.m4 rm -f m4/po.m4 rm -f m4/progtest.m4 rm -f po/Makefile.in.in -rm -f po/remove-potcdate.sin +rm -f po/remove-potcdate.sed # Generated by aclocal. rm -f aclocal.m4 diff --git a/gettext-tools/examples/hello-c++20/autoclean.sh b/gettext-tools/examples/hello-c++20/autoclean.sh index d18688a59..1838e8d23 100755 --- a/gettext-tools/examples/hello-c++20/autoclean.sh +++ b/gettext-tools/examples/hello-c++20/autoclean.sh @@ -25,7 +25,7 @@ rm -f m4/nls.m4 rm -f m4/po.m4 rm -f m4/progtest.m4 rm -f po/Makefile.in.in -rm -f po/remove-potcdate.sin +rm -f po/remove-potcdate.sed # Generated by aclocal. rm -f aclocal.m4 diff --git a/gettext-tools/examples/hello-c-gnome/autoclean.sh b/gettext-tools/examples/hello-c-gnome/autoclean.sh index 9daa77ce0..9b8332fb2 100755 --- a/gettext-tools/examples/hello-c-gnome/autoclean.sh +++ b/gettext-tools/examples/hello-c-gnome/autoclean.sh @@ -22,7 +22,7 @@ rm -f m4/nls.m4 rm -f m4/po.m4 rm -f m4/progtest.m4 rm -f po/Makefile.in.in -rm -f po/remove-potcdate.sin +rm -f po/remove-potcdate.sed # Generated by aclocal. rm -f aclocal.m4 diff --git a/gettext-tools/examples/hello-c-gnome3/autoclean.sh b/gettext-tools/examples/hello-c-gnome3/autoclean.sh index 9daa77ce0..9b8332fb2 100755 --- a/gettext-tools/examples/hello-c-gnome3/autoclean.sh +++ b/gettext-tools/examples/hello-c-gnome3/autoclean.sh @@ -22,7 +22,7 @@ rm -f m4/nls.m4 rm -f m4/po.m4 rm -f m4/progtest.m4 rm -f po/Makefile.in.in -rm -f po/remove-potcdate.sin +rm -f po/remove-potcdate.sed # Generated by aclocal. rm -f aclocal.m4 diff --git a/gettext-tools/examples/hello-c/autoclean.sh b/gettext-tools/examples/hello-c/autoclean.sh index d18688a59..1838e8d23 100755 --- a/gettext-tools/examples/hello-c/autoclean.sh +++ b/gettext-tools/examples/hello-c/autoclean.sh @@ -25,7 +25,7 @@ rm -f m4/nls.m4 rm -f m4/po.m4 rm -f m4/progtest.m4 rm -f po/Makefile.in.in -rm -f po/remove-potcdate.sin +rm -f po/remove-potcdate.sed # Generated by aclocal. rm -f aclocal.m4 diff --git a/gettext-tools/examples/hello-clisp/autoclean.sh b/gettext-tools/examples/hello-clisp/autoclean.sh index 9367df26c..8655a8717 100755 --- a/gettext-tools/examples/hello-clisp/autoclean.sh +++ b/gettext-tools/examples/hello-clisp/autoclean.sh @@ -11,7 +11,7 @@ rm -rf autom4te.cache rm -f m4/nls.m4 rm -f m4/po.m4 rm -f m4/progtest.m4 -rm -f po/remove-potcdate.sin +rm -f po/remove-potcdate.sed # Generated by aclocal. rm -f aclocal.m4 diff --git a/gettext-tools/examples/hello-clisp/autogen.sh b/gettext-tools/examples/hello-clisp/autogen.sh index 7e5197991..a972da804 100755 --- a/gettext-tools/examples/hello-clisp/autogen.sh +++ b/gettext-tools/examples/hello-clisp/autogen.sh @@ -26,7 +26,7 @@ fi cp -p ${ACLOCALDIR-$GETTEXT_TOPSRCDIR/gettext-runtime/m4}/nls.m4 m4/nls.m4 cp -p ${ACLOCALDIR-$GETTEXT_TOPSRCDIR/gettext-runtime/m4}/po.m4 m4/po.m4 cp -p ${ACLOCALDIR-$GETTEXT_TOPSRCDIR/gettext-runtime/m4}/progtest.m4 m4/progtest.m4 -cp -p ${GETTEXTSRCPODIR-$GETTEXT_TOPSRCDIR/gettext-runtime/po}/remove-potcdate.sin po/remove-potcdate.sin +cp -p ${GETTEXTSRCPODIR-$GETTEXT_TOPSRCDIR/gettext-runtime/po}/remove-potcdate.sed po/remove-potcdate.sed aclocal -I m4 diff --git a/gettext-tools/examples/hello-clisp/po/Makefile.am b/gettext-tools/examples/hello-clisp/po/Makefile.am index c3ce24a0a..58c7b6daf 100644 --- a/gettext-tools/examples/hello-clisp/po/Makefile.am +++ b/gettext-tools/examples/hello-clisp/po/Makefile.am @@ -154,7 +154,7 @@ $(srcdir)/stamp-po: $(srcdir)/$(DOMAIN).pot # The determination of whether the package xyz is a GNU one is based on the # heuristic whether some file in the top level directory mentions "GNU xyz". # If GNU 'find' is available, we avoid grepping through monster files. -$(DOMAIN).pot-update: $(POTFILES_DEPS) remove-potcdate.sed +$(DOMAIN).pot-update: $(POTFILES_DEPS) package_gnu="$(PACKAGE_GNU)"; \ test -n "$$package_gnu" || { \ if { if (LC_ALL=C find --version) 2>/dev/null | grep GNU >/dev/null; then \ @@ -206,8 +206,8 @@ $(DOMAIN).pot-update: $(POTFILES_DEPS) remove-potcdate.sed || exit 1; \ fi; \ if test -f $(srcdir)/$(DOMAIN).pot; then \ - sed -f remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot > $(DOMAIN).1po && \ - sed -f remove-potcdate.sed < $(DOMAIN).po > $(DOMAIN).2po && \ + sed -f $(srcdir)/remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot > $(DOMAIN).1po && \ + sed -f $(srcdir)/remove-potcdate.sed < $(DOMAIN).po > $(DOMAIN).2po && \ if cmp $(DOMAIN).1po $(DOMAIN).2po >/dev/null 2>&1; then \ rm -f $(DOMAIN).1po $(DOMAIN).2po $(DOMAIN).po; \ else \ @@ -340,14 +340,13 @@ uninstall-local-yes: html ID: MOSTLYCLEANFILES = -MOSTLYCLEANFILES += remove-potcdate.sed MOSTLYCLEANFILES += stamp-poT MOSTLYCLEANFILES += core core.* *.stackdump $(DOMAIN).po $(DOMAIN).1po $(DOMAIN).2po *.new.po MOSTLYCLEANFILES += *.o MAINTAINERCLEANFILES = $(DOMAIN).pot stamp-po $(GMOFILES) -EXTRA_DIST = remove-potcdate.sin LINGUAS $(POFILES) $(GMOFILES) +EXTRA_DIST = remove-potcdate.sed LINGUAS $(POFILES) $(GMOFILES) # Hidden from automake, but really activated. Works around an automake-1.5 bug. #distdir: distdir1 diff --git a/gettext-tools/examples/hello-csharp-forms/autoclean.sh b/gettext-tools/examples/hello-csharp-forms/autoclean.sh index 4e62a93e1..a4867f409 100755 --- a/gettext-tools/examples/hello-csharp-forms/autoclean.sh +++ b/gettext-tools/examples/hello-csharp-forms/autoclean.sh @@ -11,7 +11,7 @@ rm -rf autom4te.cache rm -f m4/nls.m4 rm -f m4/po.m4 rm -f m4/progtest.m4 -rm -f po/remove-potcdate.sin +rm -f po/remove-potcdate.sed # Brought in by explicit copy. rm -f m4/csharpcomp.m4 diff --git a/gettext-tools/examples/hello-csharp-forms/autogen.sh b/gettext-tools/examples/hello-csharp-forms/autogen.sh index 09596de49..5f6822c80 100755 --- a/gettext-tools/examples/hello-csharp-forms/autogen.sh +++ b/gettext-tools/examples/hello-csharp-forms/autogen.sh @@ -26,7 +26,7 @@ fi cp -p ${ACLOCALDIR-$GETTEXT_TOPSRCDIR/gettext-runtime/m4}/nls.m4 m4/nls.m4 cp -p ${ACLOCALDIR-$GETTEXT_TOPSRCDIR/gettext-runtime/m4}/po.m4 m4/po.m4 cp -p ${ACLOCALDIR-$GETTEXT_TOPSRCDIR/gettext-runtime/m4}/progtest.m4 m4/progtest.m4 -cp -p ${GETTEXTSRCPODIR-$GETTEXT_TOPSRCDIR/gettext-runtime/po}/remove-potcdate.sin po/remove-potcdate.sin +cp -p ${GETTEXTSRCPODIR-$GETTEXT_TOPSRCDIR/gettext-runtime/po}/remove-potcdate.sed po/remove-potcdate.sed cp -p ${EXAMPLESCONFIGDIR-$GETTEXT_TOPSRCDIR/gettext-tools/gnulib-m4}/csharpcomp.m4 m4/csharpcomp.m4 cp -p ${EXAMPLESCONFIGDIR-$GETTEXT_TOPSRCDIR/gettext-tools/gnulib-m4}/csharpexec.m4 m4/csharpexec.m4 diff --git a/gettext-tools/examples/hello-csharp-forms/po/Makefile.am b/gettext-tools/examples/hello-csharp-forms/po/Makefile.am index 086e3562c..7eb743bb0 100644 --- a/gettext-tools/examples/hello-csharp-forms/po/Makefile.am +++ b/gettext-tools/examples/hello-csharp-forms/po/Makefile.am @@ -137,7 +137,7 @@ $(srcdir)/stamp-po: $(srcdir)/$(DOMAIN).pot # The determination of whether the package xyz is a GNU one is based on the # heuristic whether some file in the top level directory mentions "GNU xyz". # If GNU 'find' is available, we avoid grepping through monster files. -$(DOMAIN).pot-update: $(POTFILES_DEPS) remove-potcdate.sed +$(DOMAIN).pot-update: $(POTFILES_DEPS) package_gnu="$(PACKAGE_GNU)"; \ test -n "$$package_gnu" || { \ if { if (LC_ALL=C find --version) 2>/dev/null | grep GNU >/dev/null; then \ @@ -189,8 +189,8 @@ $(DOMAIN).pot-update: $(POTFILES_DEPS) remove-potcdate.sed || exit 1; \ fi; \ if test -f $(srcdir)/$(DOMAIN).pot; then \ - sed -f remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot > $(DOMAIN).1po && \ - sed -f remove-potcdate.sed < $(DOMAIN).po > $(DOMAIN).2po && \ + sed -f $(srcdir)/remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot > $(DOMAIN).1po && \ + sed -f $(srcdir)/remove-potcdate.sed < $(DOMAIN).po > $(DOMAIN).2po && \ if cmp $(DOMAIN).1po $(DOMAIN).2po >/dev/null 2>&1; then \ rm -f $(DOMAIN).1po $(DOMAIN).2po $(DOMAIN).po; \ else \ @@ -264,7 +264,6 @@ uninstall-local-yes: html ID: MOSTLYCLEANFILES = -MOSTLYCLEANFILES += remove-potcdate.sed MOSTLYCLEANFILES += stamp-poT MOSTLYCLEANFILES += core core.* *.stackdump $(DOMAIN).po $(DOMAIN).1po $(DOMAIN).2po *.new.po @@ -278,7 +277,7 @@ maintainer-clean-local: done; \ fi -EXTRA_DIST = remove-potcdate.sin LINGUAS $(POFILES) $(RESOURCESDLLFILES) +EXTRA_DIST = remove-potcdate.sed LINGUAS $(POFILES) $(RESOURCESDLLFILES) # Hidden from automake, but really activated. Works around an automake-1.5 bug. #distdir: distdir1 diff --git a/gettext-tools/examples/hello-csharp/autoclean.sh b/gettext-tools/examples/hello-csharp/autoclean.sh index 4e62a93e1..a4867f409 100755 --- a/gettext-tools/examples/hello-csharp/autoclean.sh +++ b/gettext-tools/examples/hello-csharp/autoclean.sh @@ -11,7 +11,7 @@ rm -rf autom4te.cache rm -f m4/nls.m4 rm -f m4/po.m4 rm -f m4/progtest.m4 -rm -f po/remove-potcdate.sin +rm -f po/remove-potcdate.sed # Brought in by explicit copy. rm -f m4/csharpcomp.m4 diff --git a/gettext-tools/examples/hello-csharp/autogen.sh b/gettext-tools/examples/hello-csharp/autogen.sh index 09596de49..5f6822c80 100755 --- a/gettext-tools/examples/hello-csharp/autogen.sh +++ b/gettext-tools/examples/hello-csharp/autogen.sh @@ -26,7 +26,7 @@ fi cp -p ${ACLOCALDIR-$GETTEXT_TOPSRCDIR/gettext-runtime/m4}/nls.m4 m4/nls.m4 cp -p ${ACLOCALDIR-$GETTEXT_TOPSRCDIR/gettext-runtime/m4}/po.m4 m4/po.m4 cp -p ${ACLOCALDIR-$GETTEXT_TOPSRCDIR/gettext-runtime/m4}/progtest.m4 m4/progtest.m4 -cp -p ${GETTEXTSRCPODIR-$GETTEXT_TOPSRCDIR/gettext-runtime/po}/remove-potcdate.sin po/remove-potcdate.sin +cp -p ${GETTEXTSRCPODIR-$GETTEXT_TOPSRCDIR/gettext-runtime/po}/remove-potcdate.sed po/remove-potcdate.sed cp -p ${EXAMPLESCONFIGDIR-$GETTEXT_TOPSRCDIR/gettext-tools/gnulib-m4}/csharpcomp.m4 m4/csharpcomp.m4 cp -p ${EXAMPLESCONFIGDIR-$GETTEXT_TOPSRCDIR/gettext-tools/gnulib-m4}/csharpexec.m4 m4/csharpexec.m4 diff --git a/gettext-tools/examples/hello-csharp/po/Makefile.am b/gettext-tools/examples/hello-csharp/po/Makefile.am index 086e3562c..7eb743bb0 100644 --- a/gettext-tools/examples/hello-csharp/po/Makefile.am +++ b/gettext-tools/examples/hello-csharp/po/Makefile.am @@ -137,7 +137,7 @@ $(srcdir)/stamp-po: $(srcdir)/$(DOMAIN).pot # The determination of whether the package xyz is a GNU one is based on the # heuristic whether some file in the top level directory mentions "GNU xyz". # If GNU 'find' is available, we avoid grepping through monster files. -$(DOMAIN).pot-update: $(POTFILES_DEPS) remove-potcdate.sed +$(DOMAIN).pot-update: $(POTFILES_DEPS) package_gnu="$(PACKAGE_GNU)"; \ test -n "$$package_gnu" || { \ if { if (LC_ALL=C find --version) 2>/dev/null | grep GNU >/dev/null; then \ @@ -189,8 +189,8 @@ $(DOMAIN).pot-update: $(POTFILES_DEPS) remove-potcdate.sed || exit 1; \ fi; \ if test -f $(srcdir)/$(DOMAIN).pot; then \ - sed -f remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot > $(DOMAIN).1po && \ - sed -f remove-potcdate.sed < $(DOMAIN).po > $(DOMAIN).2po && \ + sed -f $(srcdir)/remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot > $(DOMAIN).1po && \ + sed -f $(srcdir)/remove-potcdate.sed < $(DOMAIN).po > $(DOMAIN).2po && \ if cmp $(DOMAIN).1po $(DOMAIN).2po >/dev/null 2>&1; then \ rm -f $(DOMAIN).1po $(DOMAIN).2po $(DOMAIN).po; \ else \ @@ -264,7 +264,6 @@ uninstall-local-yes: html ID: MOSTLYCLEANFILES = -MOSTLYCLEANFILES += remove-potcdate.sed MOSTLYCLEANFILES += stamp-poT MOSTLYCLEANFILES += core core.* *.stackdump $(DOMAIN).po $(DOMAIN).1po $(DOMAIN).2po *.new.po @@ -278,7 +277,7 @@ maintainer-clean-local: done; \ fi -EXTRA_DIST = remove-potcdate.sin LINGUAS $(POFILES) $(RESOURCESDLLFILES) +EXTRA_DIST = remove-potcdate.sed LINGUAS $(POFILES) $(RESOURCESDLLFILES) # Hidden from automake, but really activated. Works around an automake-1.5 bug. #distdir: distdir1 diff --git a/gettext-tools/examples/hello-gawk/autoclean.sh b/gettext-tools/examples/hello-gawk/autoclean.sh index 9367df26c..8655a8717 100755 --- a/gettext-tools/examples/hello-gawk/autoclean.sh +++ b/gettext-tools/examples/hello-gawk/autoclean.sh @@ -11,7 +11,7 @@ rm -rf autom4te.cache rm -f m4/nls.m4 rm -f m4/po.m4 rm -f m4/progtest.m4 -rm -f po/remove-potcdate.sin +rm -f po/remove-potcdate.sed # Generated by aclocal. rm -f aclocal.m4 diff --git a/gettext-tools/examples/hello-gawk/autogen.sh b/gettext-tools/examples/hello-gawk/autogen.sh index 7e5197991..a972da804 100755 --- a/gettext-tools/examples/hello-gawk/autogen.sh +++ b/gettext-tools/examples/hello-gawk/autogen.sh @@ -26,7 +26,7 @@ fi cp -p ${ACLOCALDIR-$GETTEXT_TOPSRCDIR/gettext-runtime/m4}/nls.m4 m4/nls.m4 cp -p ${ACLOCALDIR-$GETTEXT_TOPSRCDIR/gettext-runtime/m4}/po.m4 m4/po.m4 cp -p ${ACLOCALDIR-$GETTEXT_TOPSRCDIR/gettext-runtime/m4}/progtest.m4 m4/progtest.m4 -cp -p ${GETTEXTSRCPODIR-$GETTEXT_TOPSRCDIR/gettext-runtime/po}/remove-potcdate.sin po/remove-potcdate.sin +cp -p ${GETTEXTSRCPODIR-$GETTEXT_TOPSRCDIR/gettext-runtime/po}/remove-potcdate.sed po/remove-potcdate.sed aclocal -I m4 diff --git a/gettext-tools/examples/hello-gawk/po/Makefile.am b/gettext-tools/examples/hello-gawk/po/Makefile.am index 319df21d8..18eb630f7 100644 --- a/gettext-tools/examples/hello-gawk/po/Makefile.am +++ b/gettext-tools/examples/hello-gawk/po/Makefile.am @@ -154,7 +154,7 @@ $(srcdir)/stamp-po: $(srcdir)/$(DOMAIN).pot # The determination of whether the package xyz is a GNU one is based on the # heuristic whether some file in the top level directory mentions "GNU xyz". # If GNU 'find' is available, we avoid grepping through monster files. -$(DOMAIN).pot-update: $(POTFILES_DEPS) remove-potcdate.sed +$(DOMAIN).pot-update: $(POTFILES_DEPS) package_gnu="$(PACKAGE_GNU)"; \ test -n "$$package_gnu" || { \ if { if (LC_ALL=C find --version) 2>/dev/null | grep GNU >/dev/null; then \ @@ -206,8 +206,8 @@ $(DOMAIN).pot-update: $(POTFILES_DEPS) remove-potcdate.sed || exit 1; \ fi; \ if test -f $(srcdir)/$(DOMAIN).pot; then \ - sed -f remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot > $(DOMAIN).1po && \ - sed -f remove-potcdate.sed < $(DOMAIN).po > $(DOMAIN).2po && \ + sed -f $(srcdir)/remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot > $(DOMAIN).1po && \ + sed -f $(srcdir)/remove-potcdate.sed < $(DOMAIN).po > $(DOMAIN).2po && \ if cmp $(DOMAIN).1po $(DOMAIN).2po >/dev/null 2>&1; then \ rm -f $(DOMAIN).1po $(DOMAIN).2po $(DOMAIN).po; \ else \ @@ -340,14 +340,13 @@ uninstall-local-yes: html ID: MOSTLYCLEANFILES = -MOSTLYCLEANFILES += remove-potcdate.sed MOSTLYCLEANFILES += stamp-poT MOSTLYCLEANFILES += core core.* *.stackdump $(DOMAIN).po $(DOMAIN).1po $(DOMAIN).2po *.new.po MOSTLYCLEANFILES += *.o MAINTAINERCLEANFILES = $(DOMAIN).pot stamp-po $(GMOFILES) -EXTRA_DIST = remove-potcdate.sin LINGUAS $(POFILES) $(GMOFILES) +EXTRA_DIST = remove-potcdate.sed LINGUAS $(POFILES) $(GMOFILES) # Hidden from automake, but really activated. Works around an automake-1.5 bug. #distdir: distdir1 diff --git a/gettext-tools/examples/hello-guile/autoclean.sh b/gettext-tools/examples/hello-guile/autoclean.sh index 9367df26c..8655a8717 100755 --- a/gettext-tools/examples/hello-guile/autoclean.sh +++ b/gettext-tools/examples/hello-guile/autoclean.sh @@ -11,7 +11,7 @@ rm -rf autom4te.cache rm -f m4/nls.m4 rm -f m4/po.m4 rm -f m4/progtest.m4 -rm -f po/remove-potcdate.sin +rm -f po/remove-potcdate.sed # Generated by aclocal. rm -f aclocal.m4 diff --git a/gettext-tools/examples/hello-guile/autogen.sh b/gettext-tools/examples/hello-guile/autogen.sh index 7e5197991..a972da804 100755 --- a/gettext-tools/examples/hello-guile/autogen.sh +++ b/gettext-tools/examples/hello-guile/autogen.sh @@ -26,7 +26,7 @@ fi cp -p ${ACLOCALDIR-$GETTEXT_TOPSRCDIR/gettext-runtime/m4}/nls.m4 m4/nls.m4 cp -p ${ACLOCALDIR-$GETTEXT_TOPSRCDIR/gettext-runtime/m4}/po.m4 m4/po.m4 cp -p ${ACLOCALDIR-$GETTEXT_TOPSRCDIR/gettext-runtime/m4}/progtest.m4 m4/progtest.m4 -cp -p ${GETTEXTSRCPODIR-$GETTEXT_TOPSRCDIR/gettext-runtime/po}/remove-potcdate.sin po/remove-potcdate.sin +cp -p ${GETTEXTSRCPODIR-$GETTEXT_TOPSRCDIR/gettext-runtime/po}/remove-potcdate.sed po/remove-potcdate.sed aclocal -I m4 diff --git a/gettext-tools/examples/hello-guile/po/Makefile.am b/gettext-tools/examples/hello-guile/po/Makefile.am index c2f2ca9da..1f83bb4dd 100644 --- a/gettext-tools/examples/hello-guile/po/Makefile.am +++ b/gettext-tools/examples/hello-guile/po/Makefile.am @@ -154,7 +154,7 @@ $(srcdir)/stamp-po: $(srcdir)/$(DOMAIN).pot # The determination of whether the package xyz is a GNU one is based on the # heuristic whether some file in the top level directory mentions "GNU xyz". # If GNU 'find' is available, we avoid grepping through monster files. -$(DOMAIN).pot-update: $(POTFILES_DEPS) remove-potcdate.sed +$(DOMAIN).pot-update: $(POTFILES_DEPS) package_gnu="$(PACKAGE_GNU)"; \ test -n "$$package_gnu" || { \ if { if (LC_ALL=C find --version) 2>/dev/null | grep GNU >/dev/null; then \ @@ -206,8 +206,8 @@ $(DOMAIN).pot-update: $(POTFILES_DEPS) remove-potcdate.sed || exit 1; \ fi; \ if test -f $(srcdir)/$(DOMAIN).pot; then \ - sed -f remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot > $(DOMAIN).1po && \ - sed -f remove-potcdate.sed < $(DOMAIN).po > $(DOMAIN).2po && \ + sed -f $(srcdir)/remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot > $(DOMAIN).1po && \ + sed -f $(srcdir)/remove-potcdate.sed < $(DOMAIN).po > $(DOMAIN).2po && \ if cmp $(DOMAIN).1po $(DOMAIN).2po >/dev/null 2>&1; then \ rm -f $(DOMAIN).1po $(DOMAIN).2po $(DOMAIN).po; \ else \ @@ -340,14 +340,13 @@ uninstall-local-yes: html ID: MOSTLYCLEANFILES = -MOSTLYCLEANFILES += remove-potcdate.sed MOSTLYCLEANFILES += stamp-poT MOSTLYCLEANFILES += core core.* *.stackdump $(DOMAIN).po $(DOMAIN).1po $(DOMAIN).2po *.new.po MOSTLYCLEANFILES += *.o MAINTAINERCLEANFILES = $(DOMAIN).pot stamp-po $(GMOFILES) -EXTRA_DIST = remove-potcdate.sin LINGUAS $(POFILES) $(GMOFILES) +EXTRA_DIST = remove-potcdate.sed LINGUAS $(POFILES) $(GMOFILES) # Hidden from automake, but really activated. Works around an automake-1.5 bug. #distdir: distdir1 diff --git a/gettext-tools/examples/hello-java-awt/autoclean.sh b/gettext-tools/examples/hello-java-awt/autoclean.sh index efecfcbe9..d38a4183c 100755 --- a/gettext-tools/examples/hello-java-awt/autoclean.sh +++ b/gettext-tools/examples/hello-java-awt/autoclean.sh @@ -11,7 +11,7 @@ rm -rf autom4te.cache rm -f m4/nls.m4 rm -f m4/po.m4 rm -f m4/progtest.m4 -rm -f po/remove-potcdate.sin +rm -f po/remove-potcdate.sed # Brought in by explicit copy. rm -f m4/javacomp.m4 diff --git a/gettext-tools/examples/hello-java-awt/autogen.sh b/gettext-tools/examples/hello-java-awt/autogen.sh index 467f213af..2d62267d8 100755 --- a/gettext-tools/examples/hello-java-awt/autogen.sh +++ b/gettext-tools/examples/hello-java-awt/autogen.sh @@ -26,7 +26,7 @@ fi cp -p ${ACLOCALDIR-$GETTEXT_TOPSRCDIR/gettext-runtime/m4}/nls.m4 m4/nls.m4 cp -p ${ACLOCALDIR-$GETTEXT_TOPSRCDIR/gettext-runtime/m4}/po.m4 m4/po.m4 cp -p ${ACLOCALDIR-$GETTEXT_TOPSRCDIR/gettext-runtime/m4}/progtest.m4 m4/progtest.m4 -cp -p ${GETTEXTSRCPODIR-$GETTEXT_TOPSRCDIR/gettext-runtime/po}/remove-potcdate.sin po/remove-potcdate.sin +cp -p ${GETTEXTSRCPODIR-$GETTEXT_TOPSRCDIR/gettext-runtime/po}/remove-potcdate.sed po/remove-potcdate.sed cp -p ${EXAMPLESCONFIGDIR-$GETTEXT_TOPSRCDIR/gettext-tools/gnulib-m4}/javacomp.m4 m4/javacomp.m4 cp -p ${EXAMPLESCONFIGDIR-$GETTEXT_TOPSRCDIR/gettext-tools/gnulib-m4}/javaexec.m4 m4/javaexec.m4 diff --git a/gettext-tools/examples/hello-java-awt/po/Makefile.am b/gettext-tools/examples/hello-java-awt/po/Makefile.am index 3398bc1a3..1f97ec842 100644 --- a/gettext-tools/examples/hello-java-awt/po/Makefile.am +++ b/gettext-tools/examples/hello-java-awt/po/Makefile.am @@ -134,7 +134,7 @@ $(srcdir)/stamp-po: $(srcdir)/$(DOMAIN).pot # The determination of whether the package xyz is a GNU one is based on the # heuristic whether some file in the top level directory mentions "GNU xyz". # If GNU 'find' is available, we avoid grepping through monster files. -$(DOMAIN).pot-update: $(POTFILES_DEPS) remove-potcdate.sed +$(DOMAIN).pot-update: $(POTFILES_DEPS) package_gnu="$(PACKAGE_GNU)"; \ test -n "$$package_gnu" || { \ if { if (LC_ALL=C find --version) 2>/dev/null | grep GNU >/dev/null; then \ @@ -186,8 +186,8 @@ $(DOMAIN).pot-update: $(POTFILES_DEPS) remove-potcdate.sed || exit 1; \ fi; \ if test -f $(srcdir)/$(DOMAIN).pot; then \ - sed -f remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot > $(DOMAIN).1po && \ - sed -f remove-potcdate.sed < $(DOMAIN).po > $(DOMAIN).2po && \ + sed -f $(srcdir)/remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot > $(DOMAIN).1po && \ + sed -f $(srcdir)/remove-potcdate.sed < $(DOMAIN).po > $(DOMAIN).2po && \ if cmp $(DOMAIN).1po $(DOMAIN).2po >/dev/null 2>&1; then \ rm -f $(DOMAIN).1po $(DOMAIN).2po $(DOMAIN).po; \ else \ @@ -232,7 +232,6 @@ $(POFILES): $(srcdir)/$(DOMAIN).pot html ID: MOSTLYCLEANFILES = -MOSTLYCLEANFILES += remove-potcdate.sed MOSTLYCLEANFILES += stamp-poT MOSTLYCLEANFILES += core core.* *.stackdump $(DOMAIN).po $(DOMAIN).1po $(DOMAIN).2po *.new.po @@ -240,7 +239,7 @@ MAINTAINERCLEANFILES = \ $(DOMAIN).pot stamp-po \ $(DOMAIN).properties $(PROPERTIESFILES) $(CLASSFILES) -EXTRA_DIST = remove-potcdate.sin LINGUAS $(POFILES) $(DOMAIN).properties $(PROPERTIESFILES) +EXTRA_DIST = remove-potcdate.sed LINGUAS $(POFILES) $(DOMAIN).properties $(PROPERTIESFILES) # Hidden from automake, but really activated. Works around an automake-1.5 bug. #distdir: distdir1 diff --git a/gettext-tools/examples/hello-java-qtjambi/autoclean.sh b/gettext-tools/examples/hello-java-qtjambi/autoclean.sh index 1329c3715..956ca531c 100755 --- a/gettext-tools/examples/hello-java-qtjambi/autoclean.sh +++ b/gettext-tools/examples/hello-java-qtjambi/autoclean.sh @@ -11,7 +11,7 @@ rm -rf autom4te.cache rm -f m4/nls.m4 rm -f m4/po.m4 rm -f m4/progtest.m4 -rm -f po/remove-potcdate.sin +rm -f po/remove-potcdate.sed # Brought in by explicit copy. rm -f m4/javacomp.m4 diff --git a/gettext-tools/examples/hello-java-qtjambi/autogen.sh b/gettext-tools/examples/hello-java-qtjambi/autogen.sh index 467f213af..2d62267d8 100755 --- a/gettext-tools/examples/hello-java-qtjambi/autogen.sh +++ b/gettext-tools/examples/hello-java-qtjambi/autogen.sh @@ -26,7 +26,7 @@ fi cp -p ${ACLOCALDIR-$GETTEXT_TOPSRCDIR/gettext-runtime/m4}/nls.m4 m4/nls.m4 cp -p ${ACLOCALDIR-$GETTEXT_TOPSRCDIR/gettext-runtime/m4}/po.m4 m4/po.m4 cp -p ${ACLOCALDIR-$GETTEXT_TOPSRCDIR/gettext-runtime/m4}/progtest.m4 m4/progtest.m4 -cp -p ${GETTEXTSRCPODIR-$GETTEXT_TOPSRCDIR/gettext-runtime/po}/remove-potcdate.sin po/remove-potcdate.sin +cp -p ${GETTEXTSRCPODIR-$GETTEXT_TOPSRCDIR/gettext-runtime/po}/remove-potcdate.sed po/remove-potcdate.sed cp -p ${EXAMPLESCONFIGDIR-$GETTEXT_TOPSRCDIR/gettext-tools/gnulib-m4}/javacomp.m4 m4/javacomp.m4 cp -p ${EXAMPLESCONFIGDIR-$GETTEXT_TOPSRCDIR/gettext-tools/gnulib-m4}/javaexec.m4 m4/javaexec.m4 diff --git a/gettext-tools/examples/hello-java-qtjambi/po/Makefile.am b/gettext-tools/examples/hello-java-qtjambi/po/Makefile.am index 3398bc1a3..1f97ec842 100644 --- a/gettext-tools/examples/hello-java-qtjambi/po/Makefile.am +++ b/gettext-tools/examples/hello-java-qtjambi/po/Makefile.am @@ -134,7 +134,7 @@ $(srcdir)/stamp-po: $(srcdir)/$(DOMAIN).pot # The determination of whether the package xyz is a GNU one is based on the # heuristic whether some file in the top level directory mentions "GNU xyz". # If GNU 'find' is available, we avoid grepping through monster files. -$(DOMAIN).pot-update: $(POTFILES_DEPS) remove-potcdate.sed +$(DOMAIN).pot-update: $(POTFILES_DEPS) package_gnu="$(PACKAGE_GNU)"; \ test -n "$$package_gnu" || { \ if { if (LC_ALL=C find --version) 2>/dev/null | grep GNU >/dev/null; then \ @@ -186,8 +186,8 @@ $(DOMAIN).pot-update: $(POTFILES_DEPS) remove-potcdate.sed || exit 1; \ fi; \ if test -f $(srcdir)/$(DOMAIN).pot; then \ - sed -f remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot > $(DOMAIN).1po && \ - sed -f remove-potcdate.sed < $(DOMAIN).po > $(DOMAIN).2po && \ + sed -f $(srcdir)/remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot > $(DOMAIN).1po && \ + sed -f $(srcdir)/remove-potcdate.sed < $(DOMAIN).po > $(DOMAIN).2po && \ if cmp $(DOMAIN).1po $(DOMAIN).2po >/dev/null 2>&1; then \ rm -f $(DOMAIN).1po $(DOMAIN).2po $(DOMAIN).po; \ else \ @@ -232,7 +232,6 @@ $(POFILES): $(srcdir)/$(DOMAIN).pot html ID: MOSTLYCLEANFILES = -MOSTLYCLEANFILES += remove-potcdate.sed MOSTLYCLEANFILES += stamp-poT MOSTLYCLEANFILES += core core.* *.stackdump $(DOMAIN).po $(DOMAIN).1po $(DOMAIN).2po *.new.po @@ -240,7 +239,7 @@ MAINTAINERCLEANFILES = \ $(DOMAIN).pot stamp-po \ $(DOMAIN).properties $(PROPERTIESFILES) $(CLASSFILES) -EXTRA_DIST = remove-potcdate.sin LINGUAS $(POFILES) $(DOMAIN).properties $(PROPERTIESFILES) +EXTRA_DIST = remove-potcdate.sed LINGUAS $(POFILES) $(DOMAIN).properties $(PROPERTIESFILES) # Hidden from automake, but really activated. Works around an automake-1.5 bug. #distdir: distdir1 diff --git a/gettext-tools/examples/hello-java-swing/autoclean.sh b/gettext-tools/examples/hello-java-swing/autoclean.sh index 41997040b..294f08516 100755 --- a/gettext-tools/examples/hello-java-swing/autoclean.sh +++ b/gettext-tools/examples/hello-java-swing/autoclean.sh @@ -11,7 +11,7 @@ rm -rf autom4te.cache rm -f m4/nls.m4 rm -f m4/po.m4 rm -f m4/progtest.m4 -rm -f po/remove-potcdate.sin +rm -f po/remove-potcdate.sed # Brought in by explicit copy. rm -f m4/javacomp.m4 diff --git a/gettext-tools/examples/hello-java-swing/autogen.sh b/gettext-tools/examples/hello-java-swing/autogen.sh index 467f213af..2d62267d8 100755 --- a/gettext-tools/examples/hello-java-swing/autogen.sh +++ b/gettext-tools/examples/hello-java-swing/autogen.sh @@ -26,7 +26,7 @@ fi cp -p ${ACLOCALDIR-$GETTEXT_TOPSRCDIR/gettext-runtime/m4}/nls.m4 m4/nls.m4 cp -p ${ACLOCALDIR-$GETTEXT_TOPSRCDIR/gettext-runtime/m4}/po.m4 m4/po.m4 cp -p ${ACLOCALDIR-$GETTEXT_TOPSRCDIR/gettext-runtime/m4}/progtest.m4 m4/progtest.m4 -cp -p ${GETTEXTSRCPODIR-$GETTEXT_TOPSRCDIR/gettext-runtime/po}/remove-potcdate.sin po/remove-potcdate.sin +cp -p ${GETTEXTSRCPODIR-$GETTEXT_TOPSRCDIR/gettext-runtime/po}/remove-potcdate.sed po/remove-potcdate.sed cp -p ${EXAMPLESCONFIGDIR-$GETTEXT_TOPSRCDIR/gettext-tools/gnulib-m4}/javacomp.m4 m4/javacomp.m4 cp -p ${EXAMPLESCONFIGDIR-$GETTEXT_TOPSRCDIR/gettext-tools/gnulib-m4}/javaexec.m4 m4/javaexec.m4 diff --git a/gettext-tools/examples/hello-java-swing/po/Makefile.am b/gettext-tools/examples/hello-java-swing/po/Makefile.am index 3398bc1a3..1f97ec842 100644 --- a/gettext-tools/examples/hello-java-swing/po/Makefile.am +++ b/gettext-tools/examples/hello-java-swing/po/Makefile.am @@ -134,7 +134,7 @@ $(srcdir)/stamp-po: $(srcdir)/$(DOMAIN).pot # The determination of whether the package xyz is a GNU one is based on the # heuristic whether some file in the top level directory mentions "GNU xyz". # If GNU 'find' is available, we avoid grepping through monster files. -$(DOMAIN).pot-update: $(POTFILES_DEPS) remove-potcdate.sed +$(DOMAIN).pot-update: $(POTFILES_DEPS) package_gnu="$(PACKAGE_GNU)"; \ test -n "$$package_gnu" || { \ if { if (LC_ALL=C find --version) 2>/dev/null | grep GNU >/dev/null; then \ @@ -186,8 +186,8 @@ $(DOMAIN).pot-update: $(POTFILES_DEPS) remove-potcdate.sed || exit 1; \ fi; \ if test -f $(srcdir)/$(DOMAIN).pot; then \ - sed -f remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot > $(DOMAIN).1po && \ - sed -f remove-potcdate.sed < $(DOMAIN).po > $(DOMAIN).2po && \ + sed -f $(srcdir)/remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot > $(DOMAIN).1po && \ + sed -f $(srcdir)/remove-potcdate.sed < $(DOMAIN).po > $(DOMAIN).2po && \ if cmp $(DOMAIN).1po $(DOMAIN).2po >/dev/null 2>&1; then \ rm -f $(DOMAIN).1po $(DOMAIN).2po $(DOMAIN).po; \ else \ @@ -232,7 +232,6 @@ $(POFILES): $(srcdir)/$(DOMAIN).pot html ID: MOSTLYCLEANFILES = -MOSTLYCLEANFILES += remove-potcdate.sed MOSTLYCLEANFILES += stamp-poT MOSTLYCLEANFILES += core core.* *.stackdump $(DOMAIN).po $(DOMAIN).1po $(DOMAIN).2po *.new.po @@ -240,7 +239,7 @@ MAINTAINERCLEANFILES = \ $(DOMAIN).pot stamp-po \ $(DOMAIN).properties $(PROPERTIESFILES) $(CLASSFILES) -EXTRA_DIST = remove-potcdate.sin LINGUAS $(POFILES) $(DOMAIN).properties $(PROPERTIESFILES) +EXTRA_DIST = remove-potcdate.sed LINGUAS $(POFILES) $(DOMAIN).properties $(PROPERTIESFILES) # Hidden from automake, but really activated. Works around an automake-1.5 bug. #distdir: distdir1 diff --git a/gettext-tools/examples/hello-java/autoclean.sh b/gettext-tools/examples/hello-java/autoclean.sh index bac7f4ab0..89229cf92 100755 --- a/gettext-tools/examples/hello-java/autoclean.sh +++ b/gettext-tools/examples/hello-java/autoclean.sh @@ -11,7 +11,7 @@ rm -rf autom4te.cache rm -f m4/nls.m4 rm -f m4/po.m4 rm -f m4/progtest.m4 -rm -f po/remove-potcdate.sin +rm -f po/remove-potcdate.sed # Brought in by explicit copy. rm -f m4/javacomp.m4 diff --git a/gettext-tools/examples/hello-java/autogen.sh b/gettext-tools/examples/hello-java/autogen.sh index 467f213af..2d62267d8 100755 --- a/gettext-tools/examples/hello-java/autogen.sh +++ b/gettext-tools/examples/hello-java/autogen.sh @@ -26,7 +26,7 @@ fi cp -p ${ACLOCALDIR-$GETTEXT_TOPSRCDIR/gettext-runtime/m4}/nls.m4 m4/nls.m4 cp -p ${ACLOCALDIR-$GETTEXT_TOPSRCDIR/gettext-runtime/m4}/po.m4 m4/po.m4 cp -p ${ACLOCALDIR-$GETTEXT_TOPSRCDIR/gettext-runtime/m4}/progtest.m4 m4/progtest.m4 -cp -p ${GETTEXTSRCPODIR-$GETTEXT_TOPSRCDIR/gettext-runtime/po}/remove-potcdate.sin po/remove-potcdate.sin +cp -p ${GETTEXTSRCPODIR-$GETTEXT_TOPSRCDIR/gettext-runtime/po}/remove-potcdate.sed po/remove-potcdate.sed cp -p ${EXAMPLESCONFIGDIR-$GETTEXT_TOPSRCDIR/gettext-tools/gnulib-m4}/javacomp.m4 m4/javacomp.m4 cp -p ${EXAMPLESCONFIGDIR-$GETTEXT_TOPSRCDIR/gettext-tools/gnulib-m4}/javaexec.m4 m4/javaexec.m4 diff --git a/gettext-tools/examples/hello-java/po/Makefile.am b/gettext-tools/examples/hello-java/po/Makefile.am index 3398bc1a3..1f97ec842 100644 --- a/gettext-tools/examples/hello-java/po/Makefile.am +++ b/gettext-tools/examples/hello-java/po/Makefile.am @@ -134,7 +134,7 @@ $(srcdir)/stamp-po: $(srcdir)/$(DOMAIN).pot # The determination of whether the package xyz is a GNU one is based on the # heuristic whether some file in the top level directory mentions "GNU xyz". # If GNU 'find' is available, we avoid grepping through monster files. -$(DOMAIN).pot-update: $(POTFILES_DEPS) remove-potcdate.sed +$(DOMAIN).pot-update: $(POTFILES_DEPS) package_gnu="$(PACKAGE_GNU)"; \ test -n "$$package_gnu" || { \ if { if (LC_ALL=C find --version) 2>/dev/null | grep GNU >/dev/null; then \ @@ -186,8 +186,8 @@ $(DOMAIN).pot-update: $(POTFILES_DEPS) remove-potcdate.sed || exit 1; \ fi; \ if test -f $(srcdir)/$(DOMAIN).pot; then \ - sed -f remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot > $(DOMAIN).1po && \ - sed -f remove-potcdate.sed < $(DOMAIN).po > $(DOMAIN).2po && \ + sed -f $(srcdir)/remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot > $(DOMAIN).1po && \ + sed -f $(srcdir)/remove-potcdate.sed < $(DOMAIN).po > $(DOMAIN).2po && \ if cmp $(DOMAIN).1po $(DOMAIN).2po >/dev/null 2>&1; then \ rm -f $(DOMAIN).1po $(DOMAIN).2po $(DOMAIN).po; \ else \ @@ -232,7 +232,6 @@ $(POFILES): $(srcdir)/$(DOMAIN).pot html ID: MOSTLYCLEANFILES = -MOSTLYCLEANFILES += remove-potcdate.sed MOSTLYCLEANFILES += stamp-poT MOSTLYCLEANFILES += core core.* *.stackdump $(DOMAIN).po $(DOMAIN).1po $(DOMAIN).2po *.new.po @@ -240,7 +239,7 @@ MAINTAINERCLEANFILES = \ $(DOMAIN).pot stamp-po \ $(DOMAIN).properties $(PROPERTIESFILES) $(CLASSFILES) -EXTRA_DIST = remove-potcdate.sin LINGUAS $(POFILES) $(DOMAIN).properties $(PROPERTIESFILES) +EXTRA_DIST = remove-potcdate.sed LINGUAS $(POFILES) $(DOMAIN).properties $(PROPERTIESFILES) # Hidden from automake, but really activated. Works around an automake-1.5 bug. #distdir: distdir1 diff --git a/gettext-tools/examples/hello-librep/autoclean.sh b/gettext-tools/examples/hello-librep/autoclean.sh index 9367df26c..8655a8717 100755 --- a/gettext-tools/examples/hello-librep/autoclean.sh +++ b/gettext-tools/examples/hello-librep/autoclean.sh @@ -11,7 +11,7 @@ rm -rf autom4te.cache rm -f m4/nls.m4 rm -f m4/po.m4 rm -f m4/progtest.m4 -rm -f po/remove-potcdate.sin +rm -f po/remove-potcdate.sed # Generated by aclocal. rm -f aclocal.m4 diff --git a/gettext-tools/examples/hello-librep/autogen.sh b/gettext-tools/examples/hello-librep/autogen.sh index 7e5197991..a972da804 100755 --- a/gettext-tools/examples/hello-librep/autogen.sh +++ b/gettext-tools/examples/hello-librep/autogen.sh @@ -26,7 +26,7 @@ fi cp -p ${ACLOCALDIR-$GETTEXT_TOPSRCDIR/gettext-runtime/m4}/nls.m4 m4/nls.m4 cp -p ${ACLOCALDIR-$GETTEXT_TOPSRCDIR/gettext-runtime/m4}/po.m4 m4/po.m4 cp -p ${ACLOCALDIR-$GETTEXT_TOPSRCDIR/gettext-runtime/m4}/progtest.m4 m4/progtest.m4 -cp -p ${GETTEXTSRCPODIR-$GETTEXT_TOPSRCDIR/gettext-runtime/po}/remove-potcdate.sin po/remove-potcdate.sin +cp -p ${GETTEXTSRCPODIR-$GETTEXT_TOPSRCDIR/gettext-runtime/po}/remove-potcdate.sed po/remove-potcdate.sed aclocal -I m4 diff --git a/gettext-tools/examples/hello-librep/po/Makefile.am b/gettext-tools/examples/hello-librep/po/Makefile.am index 98e9fbf8b..05348bbcd 100644 --- a/gettext-tools/examples/hello-librep/po/Makefile.am +++ b/gettext-tools/examples/hello-librep/po/Makefile.am @@ -154,7 +154,7 @@ $(srcdir)/stamp-po: $(srcdir)/$(DOMAIN).pot # The determination of whether the package xyz is a GNU one is based on the # heuristic whether some file in the top level directory mentions "GNU xyz". # If GNU 'find' is available, we avoid grepping through monster files. -$(DOMAIN).pot-update: $(POTFILES_DEPS) remove-potcdate.sed +$(DOMAIN).pot-update: $(POTFILES_DEPS) package_gnu="$(PACKAGE_GNU)"; \ test -n "$$package_gnu" || { \ if { if (LC_ALL=C find --version) 2>/dev/null | grep GNU >/dev/null; then \ @@ -206,8 +206,8 @@ $(DOMAIN).pot-update: $(POTFILES_DEPS) remove-potcdate.sed || exit 1; \ fi; \ if test -f $(srcdir)/$(DOMAIN).pot; then \ - sed -f remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot > $(DOMAIN).1po && \ - sed -f remove-potcdate.sed < $(DOMAIN).po > $(DOMAIN).2po && \ + sed -f $(srcdir)/remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot > $(DOMAIN).1po && \ + sed -f $(srcdir)/remove-potcdate.sed < $(DOMAIN).po > $(DOMAIN).2po && \ if cmp $(DOMAIN).1po $(DOMAIN).2po >/dev/null 2>&1; then \ rm -f $(DOMAIN).1po $(DOMAIN).2po $(DOMAIN).po; \ else \ @@ -340,14 +340,13 @@ uninstall-local-yes: html ID: MOSTLYCLEANFILES = -MOSTLYCLEANFILES += remove-potcdate.sed MOSTLYCLEANFILES += stamp-poT MOSTLYCLEANFILES += core core.* *.stackdump $(DOMAIN).po $(DOMAIN).1po $(DOMAIN).2po *.new.po MOSTLYCLEANFILES += *.o MAINTAINERCLEANFILES = $(DOMAIN).pot stamp-po $(GMOFILES) -EXTRA_DIST = remove-potcdate.sin LINGUAS $(POFILES) $(GMOFILES) +EXTRA_DIST = remove-potcdate.sed LINGUAS $(POFILES) $(GMOFILES) # Hidden from automake, but really activated. Works around an automake-1.5 bug. #distdir: distdir1 diff --git a/gettext-tools/examples/hello-objc-gnome/autoclean.sh b/gettext-tools/examples/hello-objc-gnome/autoclean.sh index 9daa77ce0..9b8332fb2 100755 --- a/gettext-tools/examples/hello-objc-gnome/autoclean.sh +++ b/gettext-tools/examples/hello-objc-gnome/autoclean.sh @@ -22,7 +22,7 @@ rm -f m4/nls.m4 rm -f m4/po.m4 rm -f m4/progtest.m4 rm -f po/Makefile.in.in -rm -f po/remove-potcdate.sin +rm -f po/remove-potcdate.sed # Generated by aclocal. rm -f aclocal.m4 diff --git a/gettext-tools/examples/hello-objc-gnustep/autoclean.sh b/gettext-tools/examples/hello-objc-gnustep/autoclean.sh index 1fbc5e8ca..6b48c37f4 100755 --- a/gettext-tools/examples/hello-objc-gnustep/autoclean.sh +++ b/gettext-tools/examples/hello-objc-gnustep/autoclean.sh @@ -7,6 +7,5 @@ make distclean rm -f po/remove-potcdate.sed -rm -f po/remove-potcdate.sin rm -f po/*.pot rm -rf *.lproj diff --git a/gettext-tools/examples/hello-objc-gnustep/autogen.sh b/gettext-tools/examples/hello-objc-gnustep/autogen.sh index 1528b5017..a17b74008 100755 --- a/gettext-tools/examples/hello-objc-gnustep/autogen.sh +++ b/gettext-tools/examples/hello-objc-gnustep/autogen.sh @@ -23,4 +23,4 @@ else fi fi -cp -p ${GETTEXTSRCPODIR-$GETTEXT_TOPSRCDIR/gettext-runtime/po}/remove-potcdate.sin po/remove-potcdate.sin +cp -p ${GETTEXTSRCPODIR-$GETTEXT_TOPSRCDIR/gettext-runtime/po}/remove-potcdate.sed po/remove-potcdate.sed diff --git a/gettext-tools/examples/hello-objc-gnustep/po/GNUmakefile b/gettext-tools/examples/hello-objc-gnustep/po/GNUmakefile index 3e28e176b..ae8caf208 100644 --- a/gettext-tools/examples/hello-objc-gnustep/po/GNUmakefile +++ b/gettext-tools/examples/hello-objc-gnustep/po/GNUmakefile @@ -112,7 +112,7 @@ all-local-no: # The determination of whether the package xyz is a GNU one is based on the # heuristic whether some file in the top level directory mentions "GNU xyz". # If GNU 'find' is available, we avoid grepping through monster files. -$(DOMAIN).pot-update: $(POTFILES_DEPS) remove-potcdate.sed +$(DOMAIN).pot-update: $(POTFILES_DEPS) package_gnu="$(PACKAGE_GNU)"; \ test -n "$$package_gnu" || { \ if { if (LC_ALL=C find --version) 2>/dev/null | grep GNU >/dev/null; then \ @@ -199,9 +199,6 @@ $(POFILES): $(DOMAIN).pot $(MAKE) $${lang}.po-create; \ fi -internal-clean:: - rm -f remove-potcdate.sed - update-po: $(MAKE) $(DOMAIN).pot-update test -z "$(UPDATEPOFILES)" || $(MAKE) $(UPDATEPOFILES) diff --git a/gettext-tools/examples/hello-objc/autoclean.sh b/gettext-tools/examples/hello-objc/autoclean.sh index d18688a59..1838e8d23 100755 --- a/gettext-tools/examples/hello-objc/autoclean.sh +++ b/gettext-tools/examples/hello-objc/autoclean.sh @@ -25,7 +25,7 @@ rm -f m4/nls.m4 rm -f m4/po.m4 rm -f m4/progtest.m4 rm -f po/Makefile.in.in -rm -f po/remove-potcdate.sin +rm -f po/remove-potcdate.sed # Generated by aclocal. rm -f aclocal.m4 diff --git a/gettext-tools/examples/hello-pascal/autoclean.sh b/gettext-tools/examples/hello-pascal/autoclean.sh index 94c009111..c4313e60a 100755 --- a/gettext-tools/examples/hello-pascal/autoclean.sh +++ b/gettext-tools/examples/hello-pascal/autoclean.sh @@ -11,7 +11,7 @@ rm -rf autom4te.cache rm -f m4/nls.m4 rm -f m4/po.m4 rm -f m4/progtest.m4 -rm -f po/remove-potcdate.sin +rm -f po/remove-potcdate.sed # Generated by aclocal. rm -f aclocal.m4 diff --git a/gettext-tools/examples/hello-pascal/autogen.sh b/gettext-tools/examples/hello-pascal/autogen.sh index 7e5197991..a972da804 100755 --- a/gettext-tools/examples/hello-pascal/autogen.sh +++ b/gettext-tools/examples/hello-pascal/autogen.sh @@ -26,7 +26,7 @@ fi cp -p ${ACLOCALDIR-$GETTEXT_TOPSRCDIR/gettext-runtime/m4}/nls.m4 m4/nls.m4 cp -p ${ACLOCALDIR-$GETTEXT_TOPSRCDIR/gettext-runtime/m4}/po.m4 m4/po.m4 cp -p ${ACLOCALDIR-$GETTEXT_TOPSRCDIR/gettext-runtime/m4}/progtest.m4 m4/progtest.m4 -cp -p ${GETTEXTSRCPODIR-$GETTEXT_TOPSRCDIR/gettext-runtime/po}/remove-potcdate.sin po/remove-potcdate.sin +cp -p ${GETTEXTSRCPODIR-$GETTEXT_TOPSRCDIR/gettext-runtime/po}/remove-potcdate.sed po/remove-potcdate.sed aclocal -I m4 diff --git a/gettext-tools/examples/hello-pascal/po/Makefile.am b/gettext-tools/examples/hello-pascal/po/Makefile.am index 6ad8b9e45..374e91e09 100644 --- a/gettext-tools/examples/hello-pascal/po/Makefile.am +++ b/gettext-tools/examples/hello-pascal/po/Makefile.am @@ -154,7 +154,7 @@ $(srcdir)/stamp-po: $(srcdir)/$(DOMAIN).pot # The determination of whether the package xyz is a GNU one is based on the # heuristic whether some file in the top level directory mentions "GNU xyz". # If GNU 'find' is available, we avoid grepping through monster files. -$(DOMAIN).pot-update: $(POTFILES_DEPS) remove-potcdate.sed +$(DOMAIN).pot-update: $(POTFILES_DEPS) package_gnu="$(PACKAGE_GNU)"; \ test -n "$$package_gnu" || { \ if { if (LC_ALL=C find --version) 2>/dev/null | grep GNU >/dev/null; then \ @@ -206,8 +206,8 @@ $(DOMAIN).pot-update: $(POTFILES_DEPS) remove-potcdate.sed || exit 1; \ fi; \ if test -f $(srcdir)/$(DOMAIN).pot; then \ - sed -f remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot > $(DOMAIN).1po && \ - sed -f remove-potcdate.sed < $(DOMAIN).po > $(DOMAIN).2po && \ + sed -f $(srcdir)/remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot > $(DOMAIN).1po && \ + sed -f $(srcdir)/remove-potcdate.sed < $(DOMAIN).po > $(DOMAIN).2po && \ if cmp $(DOMAIN).1po $(DOMAIN).2po >/dev/null 2>&1; then \ rm -f $(DOMAIN).1po $(DOMAIN).2po $(DOMAIN).po; \ else \ @@ -340,14 +340,13 @@ uninstall-local-yes: html ID: MOSTLYCLEANFILES = -MOSTLYCLEANFILES += remove-potcdate.sed MOSTLYCLEANFILES += stamp-poT MOSTLYCLEANFILES += core core.* *.stackdump $(DOMAIN).po $(DOMAIN).1po $(DOMAIN).2po *.new.po MOSTLYCLEANFILES += *.o MAINTAINERCLEANFILES = $(DOMAIN).pot stamp-po $(GMOFILES) -EXTRA_DIST = remove-potcdate.sin LINGUAS $(POFILES) $(GMOFILES) +EXTRA_DIST = remove-potcdate.sed LINGUAS $(POFILES) $(GMOFILES) # Hidden from automake, but really activated. Works around an automake-1.5 bug. #distdir: distdir1 diff --git a/gettext-tools/examples/hello-perl/autoclean.sh b/gettext-tools/examples/hello-perl/autoclean.sh index 9367df26c..8655a8717 100755 --- a/gettext-tools/examples/hello-perl/autoclean.sh +++ b/gettext-tools/examples/hello-perl/autoclean.sh @@ -11,7 +11,7 @@ rm -rf autom4te.cache rm -f m4/nls.m4 rm -f m4/po.m4 rm -f m4/progtest.m4 -rm -f po/remove-potcdate.sin +rm -f po/remove-potcdate.sed # Generated by aclocal. rm -f aclocal.m4 diff --git a/gettext-tools/examples/hello-perl/autogen.sh b/gettext-tools/examples/hello-perl/autogen.sh index 7e5197991..a972da804 100755 --- a/gettext-tools/examples/hello-perl/autogen.sh +++ b/gettext-tools/examples/hello-perl/autogen.sh @@ -26,7 +26,7 @@ fi cp -p ${ACLOCALDIR-$GETTEXT_TOPSRCDIR/gettext-runtime/m4}/nls.m4 m4/nls.m4 cp -p ${ACLOCALDIR-$GETTEXT_TOPSRCDIR/gettext-runtime/m4}/po.m4 m4/po.m4 cp -p ${ACLOCALDIR-$GETTEXT_TOPSRCDIR/gettext-runtime/m4}/progtest.m4 m4/progtest.m4 -cp -p ${GETTEXTSRCPODIR-$GETTEXT_TOPSRCDIR/gettext-runtime/po}/remove-potcdate.sin po/remove-potcdate.sin +cp -p ${GETTEXTSRCPODIR-$GETTEXT_TOPSRCDIR/gettext-runtime/po}/remove-potcdate.sed po/remove-potcdate.sed aclocal -I m4 diff --git a/gettext-tools/examples/hello-perl/po/Makefile.am b/gettext-tools/examples/hello-perl/po/Makefile.am index d959b15a7..5be9f2122 100644 --- a/gettext-tools/examples/hello-perl/po/Makefile.am +++ b/gettext-tools/examples/hello-perl/po/Makefile.am @@ -164,7 +164,7 @@ $(srcdir)/stamp-po: $(srcdir)/$(DOMAIN).pot # The determination of whether the package xyz is a GNU one is based on the # heuristic whether some file in the top level directory mentions "GNU xyz". # If GNU 'find' is available, we avoid grepping through monster files. -$(DOMAIN).pot-update: $(POTFILES_DEPS) remove-potcdate.sed +$(DOMAIN).pot-update: $(POTFILES_DEPS) package_gnu="$(PACKAGE_GNU)"; \ test -n "$$package_gnu" || { \ if { if (LC_ALL=C find --version) 2>/dev/null | grep GNU >/dev/null; then \ @@ -216,8 +216,8 @@ $(DOMAIN).pot-update: $(POTFILES_DEPS) remove-potcdate.sed || exit 1; \ fi; \ if test -f $(srcdir)/$(DOMAIN).pot; then \ - sed -f remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot > $(DOMAIN).1po && \ - sed -f remove-potcdate.sed < $(DOMAIN).po > $(DOMAIN).2po && \ + sed -f $(srcdir)/remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot > $(DOMAIN).1po && \ + sed -f $(srcdir)/remove-potcdate.sed < $(DOMAIN).po > $(DOMAIN).2po && \ if cmp $(DOMAIN).1po $(DOMAIN).2po >/dev/null 2>&1; then \ rm -f $(DOMAIN).1po $(DOMAIN).2po $(DOMAIN).po; \ else \ @@ -350,14 +350,13 @@ uninstall-local-yes: html ID: MOSTLYCLEANFILES = -MOSTLYCLEANFILES += remove-potcdate.sed MOSTLYCLEANFILES += stamp-poT MOSTLYCLEANFILES += core core.* *.stackdump $(DOMAIN).po $(DOMAIN).1po $(DOMAIN).2po *.new.po MOSTLYCLEANFILES += *.o MAINTAINERCLEANFILES = $(DOMAIN).pot stamp-po $(GMOFILES) -EXTRA_DIST = remove-potcdate.sin LINGUAS $(POFILES) $(GMOFILES) +EXTRA_DIST = remove-potcdate.sed LINGUAS $(POFILES) $(GMOFILES) # Hidden from automake, but really activated. Works around an automake-1.5 bug. #distdir: distdir1 diff --git a/gettext-tools/examples/hello-php/autoclean.sh b/gettext-tools/examples/hello-php/autoclean.sh index 9367df26c..8655a8717 100755 --- a/gettext-tools/examples/hello-php/autoclean.sh +++ b/gettext-tools/examples/hello-php/autoclean.sh @@ -11,7 +11,7 @@ rm -rf autom4te.cache rm -f m4/nls.m4 rm -f m4/po.m4 rm -f m4/progtest.m4 -rm -f po/remove-potcdate.sin +rm -f po/remove-potcdate.sed # Generated by aclocal. rm -f aclocal.m4 diff --git a/gettext-tools/examples/hello-php/autogen.sh b/gettext-tools/examples/hello-php/autogen.sh index 7e5197991..a972da804 100755 --- a/gettext-tools/examples/hello-php/autogen.sh +++ b/gettext-tools/examples/hello-php/autogen.sh @@ -26,7 +26,7 @@ fi cp -p ${ACLOCALDIR-$GETTEXT_TOPSRCDIR/gettext-runtime/m4}/nls.m4 m4/nls.m4 cp -p ${ACLOCALDIR-$GETTEXT_TOPSRCDIR/gettext-runtime/m4}/po.m4 m4/po.m4 cp -p ${ACLOCALDIR-$GETTEXT_TOPSRCDIR/gettext-runtime/m4}/progtest.m4 m4/progtest.m4 -cp -p ${GETTEXTSRCPODIR-$GETTEXT_TOPSRCDIR/gettext-runtime/po}/remove-potcdate.sin po/remove-potcdate.sin +cp -p ${GETTEXTSRCPODIR-$GETTEXT_TOPSRCDIR/gettext-runtime/po}/remove-potcdate.sed po/remove-potcdate.sed aclocal -I m4 diff --git a/gettext-tools/examples/hello-php/po/Makefile.am b/gettext-tools/examples/hello-php/po/Makefile.am index 7fce015e3..287e1ca01 100644 --- a/gettext-tools/examples/hello-php/po/Makefile.am +++ b/gettext-tools/examples/hello-php/po/Makefile.am @@ -154,7 +154,7 @@ $(srcdir)/stamp-po: $(srcdir)/$(DOMAIN).pot # The determination of whether the package xyz is a GNU one is based on the # heuristic whether some file in the top level directory mentions "GNU xyz". # If GNU 'find' is available, we avoid grepping through monster files. -$(DOMAIN).pot-update: $(POTFILES_DEPS) remove-potcdate.sed +$(DOMAIN).pot-update: $(POTFILES_DEPS) package_gnu="$(PACKAGE_GNU)"; \ test -n "$$package_gnu" || { \ if { if (LC_ALL=C find --version) 2>/dev/null | grep GNU >/dev/null; then \ @@ -206,8 +206,8 @@ $(DOMAIN).pot-update: $(POTFILES_DEPS) remove-potcdate.sed || exit 1; \ fi; \ if test -f $(srcdir)/$(DOMAIN).pot; then \ - sed -f remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot > $(DOMAIN).1po && \ - sed -f remove-potcdate.sed < $(DOMAIN).po > $(DOMAIN).2po && \ + sed -f $(srcdir)/remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot > $(DOMAIN).1po && \ + sed -f $(srcdir)/remove-potcdate.sed < $(DOMAIN).po > $(DOMAIN).2po && \ if cmp $(DOMAIN).1po $(DOMAIN).2po >/dev/null 2>&1; then \ rm -f $(DOMAIN).1po $(DOMAIN).2po $(DOMAIN).po; \ else \ @@ -340,14 +340,13 @@ uninstall-local-yes: html ID: MOSTLYCLEANFILES = -MOSTLYCLEANFILES += remove-potcdate.sed MOSTLYCLEANFILES += stamp-poT MOSTLYCLEANFILES += core core.* *.stackdump $(DOMAIN).po $(DOMAIN).1po $(DOMAIN).2po *.new.po MOSTLYCLEANFILES += *.o MAINTAINERCLEANFILES = $(DOMAIN).pot stamp-po $(GMOFILES) -EXTRA_DIST = remove-potcdate.sin LINGUAS $(POFILES) $(GMOFILES) +EXTRA_DIST = remove-potcdate.sed LINGUAS $(POFILES) $(GMOFILES) # Hidden from automake, but really activated. Works around an automake-1.5 bug. #distdir: distdir1 diff --git a/gettext-tools/examples/hello-python/autoclean.sh b/gettext-tools/examples/hello-python/autoclean.sh index 9367df26c..8655a8717 100755 --- a/gettext-tools/examples/hello-python/autoclean.sh +++ b/gettext-tools/examples/hello-python/autoclean.sh @@ -11,7 +11,7 @@ rm -rf autom4te.cache rm -f m4/nls.m4 rm -f m4/po.m4 rm -f m4/progtest.m4 -rm -f po/remove-potcdate.sin +rm -f po/remove-potcdate.sed # Generated by aclocal. rm -f aclocal.m4 diff --git a/gettext-tools/examples/hello-python/autogen.sh b/gettext-tools/examples/hello-python/autogen.sh index 7e5197991..a972da804 100755 --- a/gettext-tools/examples/hello-python/autogen.sh +++ b/gettext-tools/examples/hello-python/autogen.sh @@ -26,7 +26,7 @@ fi cp -p ${ACLOCALDIR-$GETTEXT_TOPSRCDIR/gettext-runtime/m4}/nls.m4 m4/nls.m4 cp -p ${ACLOCALDIR-$GETTEXT_TOPSRCDIR/gettext-runtime/m4}/po.m4 m4/po.m4 cp -p ${ACLOCALDIR-$GETTEXT_TOPSRCDIR/gettext-runtime/m4}/progtest.m4 m4/progtest.m4 -cp -p ${GETTEXTSRCPODIR-$GETTEXT_TOPSRCDIR/gettext-runtime/po}/remove-potcdate.sin po/remove-potcdate.sin +cp -p ${GETTEXTSRCPODIR-$GETTEXT_TOPSRCDIR/gettext-runtime/po}/remove-potcdate.sed po/remove-potcdate.sed aclocal -I m4 diff --git a/gettext-tools/examples/hello-python/po/Makefile.am b/gettext-tools/examples/hello-python/po/Makefile.am index 0f2a5b436..9f0f6b60b 100644 --- a/gettext-tools/examples/hello-python/po/Makefile.am +++ b/gettext-tools/examples/hello-python/po/Makefile.am @@ -154,7 +154,7 @@ $(srcdir)/stamp-po: $(srcdir)/$(DOMAIN).pot # The determination of whether the package xyz is a GNU one is based on the # heuristic whether some file in the top level directory mentions "GNU xyz". # If GNU 'find' is available, we avoid grepping through monster files. -$(DOMAIN).pot-update: $(POTFILES_DEPS) remove-potcdate.sed +$(DOMAIN).pot-update: $(POTFILES_DEPS) package_gnu="$(PACKAGE_GNU)"; \ test -n "$$package_gnu" || { \ if { if (LC_ALL=C find --version) 2>/dev/null | grep GNU >/dev/null; then \ @@ -206,8 +206,8 @@ $(DOMAIN).pot-update: $(POTFILES_DEPS) remove-potcdate.sed || exit 1; \ fi; \ if test -f $(srcdir)/$(DOMAIN).pot; then \ - sed -f remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot > $(DOMAIN).1po && \ - sed -f remove-potcdate.sed < $(DOMAIN).po > $(DOMAIN).2po && \ + sed -f $(srcdir)/remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot > $(DOMAIN).1po && \ + sed -f $(srcdir)/remove-potcdate.sed < $(DOMAIN).po > $(DOMAIN).2po && \ if cmp $(DOMAIN).1po $(DOMAIN).2po >/dev/null 2>&1; then \ rm -f $(DOMAIN).1po $(DOMAIN).2po $(DOMAIN).po; \ else \ @@ -340,14 +340,13 @@ uninstall-local-yes: html ID: MOSTLYCLEANFILES = -MOSTLYCLEANFILES += remove-potcdate.sed MOSTLYCLEANFILES += stamp-poT MOSTLYCLEANFILES += core core.* *.stackdump $(DOMAIN).po $(DOMAIN).1po $(DOMAIN).2po *.new.po MOSTLYCLEANFILES += *.o MAINTAINERCLEANFILES = $(DOMAIN).pot stamp-po $(GMOFILES) -EXTRA_DIST = remove-potcdate.sin LINGUAS $(POFILES) $(GMOFILES) +EXTRA_DIST = remove-potcdate.sed LINGUAS $(POFILES) $(GMOFILES) # Hidden from automake, but really activated. Works around an automake-1.5 bug. #distdir: distdir1 diff --git a/gettext-tools/examples/hello-sh/autoclean.sh b/gettext-tools/examples/hello-sh/autoclean.sh index 9367df26c..8655a8717 100755 --- a/gettext-tools/examples/hello-sh/autoclean.sh +++ b/gettext-tools/examples/hello-sh/autoclean.sh @@ -11,7 +11,7 @@ rm -rf autom4te.cache rm -f m4/nls.m4 rm -f m4/po.m4 rm -f m4/progtest.m4 -rm -f po/remove-potcdate.sin +rm -f po/remove-potcdate.sed # Generated by aclocal. rm -f aclocal.m4 diff --git a/gettext-tools/examples/hello-sh/autogen.sh b/gettext-tools/examples/hello-sh/autogen.sh index 7e5197991..a972da804 100755 --- a/gettext-tools/examples/hello-sh/autogen.sh +++ b/gettext-tools/examples/hello-sh/autogen.sh @@ -26,7 +26,7 @@ fi cp -p ${ACLOCALDIR-$GETTEXT_TOPSRCDIR/gettext-runtime/m4}/nls.m4 m4/nls.m4 cp -p ${ACLOCALDIR-$GETTEXT_TOPSRCDIR/gettext-runtime/m4}/po.m4 m4/po.m4 cp -p ${ACLOCALDIR-$GETTEXT_TOPSRCDIR/gettext-runtime/m4}/progtest.m4 m4/progtest.m4 -cp -p ${GETTEXTSRCPODIR-$GETTEXT_TOPSRCDIR/gettext-runtime/po}/remove-potcdate.sin po/remove-potcdate.sin +cp -p ${GETTEXTSRCPODIR-$GETTEXT_TOPSRCDIR/gettext-runtime/po}/remove-potcdate.sed po/remove-potcdate.sed aclocal -I m4 diff --git a/gettext-tools/examples/hello-sh/po/Makefile.am b/gettext-tools/examples/hello-sh/po/Makefile.am index 7f77fb698..093e496ed 100644 --- a/gettext-tools/examples/hello-sh/po/Makefile.am +++ b/gettext-tools/examples/hello-sh/po/Makefile.am @@ -154,7 +154,7 @@ $(srcdir)/stamp-po: $(srcdir)/$(DOMAIN).pot # The determination of whether the package xyz is a GNU one is based on the # heuristic whether some file in the top level directory mentions "GNU xyz". # If GNU 'find' is available, we avoid grepping through monster files. -$(DOMAIN).pot-update: $(POTFILES_DEPS) remove-potcdate.sed +$(DOMAIN).pot-update: $(POTFILES_DEPS) package_gnu="$(PACKAGE_GNU)"; \ test -n "$$package_gnu" || { \ if { if (LC_ALL=C find --version) 2>/dev/null | grep GNU >/dev/null; then \ @@ -206,8 +206,8 @@ $(DOMAIN).pot-update: $(POTFILES_DEPS) remove-potcdate.sed || exit 1; \ fi; \ if test -f $(srcdir)/$(DOMAIN).pot; then \ - sed -f remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot > $(DOMAIN).1po && \ - sed -f remove-potcdate.sed < $(DOMAIN).po > $(DOMAIN).2po && \ + sed -f $(srcdir)/remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot > $(DOMAIN).1po && \ + sed -f $(srcdir)/remove-potcdate.sed < $(DOMAIN).po > $(DOMAIN).2po && \ if cmp $(DOMAIN).1po $(DOMAIN).2po >/dev/null 2>&1; then \ rm -f $(DOMAIN).1po $(DOMAIN).2po $(DOMAIN).po; \ else \ @@ -340,14 +340,13 @@ uninstall-local-yes: html ID: MOSTLYCLEANFILES = -MOSTLYCLEANFILES += remove-potcdate.sed MOSTLYCLEANFILES += stamp-poT MOSTLYCLEANFILES += core core.* *.stackdump $(DOMAIN).po $(DOMAIN).1po $(DOMAIN).2po *.new.po MOSTLYCLEANFILES += *.o MAINTAINERCLEANFILES = $(DOMAIN).pot stamp-po $(GMOFILES) -EXTRA_DIST = remove-potcdate.sin LINGUAS $(POFILES) $(GMOFILES) +EXTRA_DIST = remove-potcdate.sed LINGUAS $(POFILES) $(GMOFILES) # Hidden from automake, but really activated. Works around an automake-1.5 bug. #distdir: distdir1 diff --git a/gettext-tools/examples/hello-smalltalk/autoclean.sh b/gettext-tools/examples/hello-smalltalk/autoclean.sh index 9367df26c..8655a8717 100755 --- a/gettext-tools/examples/hello-smalltalk/autoclean.sh +++ b/gettext-tools/examples/hello-smalltalk/autoclean.sh @@ -11,7 +11,7 @@ rm -rf autom4te.cache rm -f m4/nls.m4 rm -f m4/po.m4 rm -f m4/progtest.m4 -rm -f po/remove-potcdate.sin +rm -f po/remove-potcdate.sed # Generated by aclocal. rm -f aclocal.m4 diff --git a/gettext-tools/examples/hello-smalltalk/autogen.sh b/gettext-tools/examples/hello-smalltalk/autogen.sh index 7e5197991..a972da804 100755 --- a/gettext-tools/examples/hello-smalltalk/autogen.sh +++ b/gettext-tools/examples/hello-smalltalk/autogen.sh @@ -26,7 +26,7 @@ fi cp -p ${ACLOCALDIR-$GETTEXT_TOPSRCDIR/gettext-runtime/m4}/nls.m4 m4/nls.m4 cp -p ${ACLOCALDIR-$GETTEXT_TOPSRCDIR/gettext-runtime/m4}/po.m4 m4/po.m4 cp -p ${ACLOCALDIR-$GETTEXT_TOPSRCDIR/gettext-runtime/m4}/progtest.m4 m4/progtest.m4 -cp -p ${GETTEXTSRCPODIR-$GETTEXT_TOPSRCDIR/gettext-runtime/po}/remove-potcdate.sin po/remove-potcdate.sin +cp -p ${GETTEXTSRCPODIR-$GETTEXT_TOPSRCDIR/gettext-runtime/po}/remove-potcdate.sed po/remove-potcdate.sed aclocal -I m4 diff --git a/gettext-tools/examples/hello-smalltalk/po/Makefile.am b/gettext-tools/examples/hello-smalltalk/po/Makefile.am index 9e1cb6968..508ee528b 100644 --- a/gettext-tools/examples/hello-smalltalk/po/Makefile.am +++ b/gettext-tools/examples/hello-smalltalk/po/Makefile.am @@ -154,7 +154,7 @@ $(srcdir)/stamp-po: $(srcdir)/$(DOMAIN).pot # The determination of whether the package xyz is a GNU one is based on the # heuristic whether some file in the top level directory mentions "GNU xyz". # If GNU 'find' is available, we avoid grepping through monster files. -$(DOMAIN).pot-update: $(POTFILES_DEPS) remove-potcdate.sed +$(DOMAIN).pot-update: $(POTFILES_DEPS) package_gnu="$(PACKAGE_GNU)"; \ test -n "$$package_gnu" || { \ if { if (LC_ALL=C find --version) 2>/dev/null | grep GNU >/dev/null; then \ @@ -206,8 +206,8 @@ $(DOMAIN).pot-update: $(POTFILES_DEPS) remove-potcdate.sed || exit 1; \ fi; \ if test -f $(srcdir)/$(DOMAIN).pot; then \ - sed -f remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot > $(DOMAIN).1po && \ - sed -f remove-potcdate.sed < $(DOMAIN).po > $(DOMAIN).2po && \ + sed -f $(srcdir)/remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot > $(DOMAIN).1po && \ + sed -f $(srcdir)/remove-potcdate.sed < $(DOMAIN).po > $(DOMAIN).2po && \ if cmp $(DOMAIN).1po $(DOMAIN).2po >/dev/null 2>&1; then \ rm -f $(DOMAIN).1po $(DOMAIN).2po $(DOMAIN).po; \ else \ @@ -340,14 +340,13 @@ uninstall-local-yes: html ID: MOSTLYCLEANFILES = -MOSTLYCLEANFILES += remove-potcdate.sed MOSTLYCLEANFILES += stamp-poT MOSTLYCLEANFILES += core core.* *.stackdump $(DOMAIN).po $(DOMAIN).1po $(DOMAIN).2po *.new.po MOSTLYCLEANFILES += *.o MAINTAINERCLEANFILES = $(DOMAIN).pot stamp-po $(GMOFILES) -EXTRA_DIST = remove-potcdate.sin LINGUAS $(POFILES) $(GMOFILES) +EXTRA_DIST = remove-potcdate.sed LINGUAS $(POFILES) $(GMOFILES) # Hidden from automake, but really activated. Works around an automake-1.5 bug. #distdir: distdir1 diff --git a/gettext-tools/examples/hello-tcl-tk/autoclean.sh b/gettext-tools/examples/hello-tcl-tk/autoclean.sh index f70a4c7f1..6f5fa67d4 100755 --- a/gettext-tools/examples/hello-tcl-tk/autoclean.sh +++ b/gettext-tools/examples/hello-tcl-tk/autoclean.sh @@ -11,7 +11,7 @@ rm -rf autom4te.cache rm -f m4/nls.m4 rm -f m4/po.m4 rm -f m4/progtest.m4 -rm -f po/remove-potcdate.sin +rm -f po/remove-potcdate.sed # Generated by aclocal. rm -f aclocal.m4 diff --git a/gettext-tools/examples/hello-tcl-tk/autogen.sh b/gettext-tools/examples/hello-tcl-tk/autogen.sh index 2b5e67b80..98187f3b2 100755 --- a/gettext-tools/examples/hello-tcl-tk/autogen.sh +++ b/gettext-tools/examples/hello-tcl-tk/autogen.sh @@ -26,7 +26,7 @@ fi cp -p ${ACLOCALDIR-$GETTEXT_TOPSRCDIR/gettext-runtime/m4}/nls.m4 m4/nls.m4 cp -p ${ACLOCALDIR-$GETTEXT_TOPSRCDIR/gettext-runtime/m4}/po.m4 m4/po.m4 cp -p ${ACLOCALDIR-$GETTEXT_TOPSRCDIR/gettext-runtime/m4}/progtest.m4 m4/progtest.m4 -cp -p ${GETTEXTSRCPODIR-$GETTEXT_TOPSRCDIR/gettext-runtime/po}/remove-potcdate.sin po/remove-potcdate.sin +cp -p ${GETTEXTSRCPODIR-$GETTEXT_TOPSRCDIR/gettext-runtime/po}/remove-potcdate.sed po/remove-potcdate.sed aclocal -I m4 diff --git a/gettext-tools/examples/hello-tcl-tk/po/Makefile.am b/gettext-tools/examples/hello-tcl-tk/po/Makefile.am index 744b40363..67891118f 100644 --- a/gettext-tools/examples/hello-tcl-tk/po/Makefile.am +++ b/gettext-tools/examples/hello-tcl-tk/po/Makefile.am @@ -134,7 +134,7 @@ $(srcdir)/stamp-po: $(srcdir)/$(DOMAIN).pot # The determination of whether the package xyz is a GNU one is based on the # heuristic whether some file in the top level directory mentions "GNU xyz". # If GNU 'find' is available, we avoid grepping through monster files. -$(DOMAIN).pot-update: $(POTFILES_DEPS) remove-potcdate.sed +$(DOMAIN).pot-update: $(POTFILES_DEPS) package_gnu="$(PACKAGE_GNU)"; \ test -n "$$package_gnu" || { \ if { if (LC_ALL=C find --version) 2>/dev/null | grep GNU >/dev/null; then \ @@ -186,8 +186,8 @@ $(DOMAIN).pot-update: $(POTFILES_DEPS) remove-potcdate.sed || exit 1; \ fi; \ if test -f $(srcdir)/$(DOMAIN).pot; then \ - sed -f remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot > $(DOMAIN).1po && \ - sed -f remove-potcdate.sed < $(DOMAIN).po > $(DOMAIN).2po && \ + sed -f $(srcdir)/remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot > $(DOMAIN).1po && \ + sed -f $(srcdir)/remove-potcdate.sed < $(DOMAIN).po > $(DOMAIN).2po && \ if cmp $(DOMAIN).1po $(DOMAIN).2po >/dev/null 2>&1; then \ rm -f $(DOMAIN).1po $(DOMAIN).2po $(DOMAIN).po; \ else \ @@ -258,14 +258,13 @@ uninstall-local-yes: html ID: MOSTLYCLEANFILES = -MOSTLYCLEANFILES += remove-potcdate.sed MOSTLYCLEANFILES += stamp-poT MOSTLYCLEANFILES += core core.* *.stackdump $(DOMAIN).po $(DOMAIN).1po $(DOMAIN).2po *.new.po MOSTLYCLEANFILES += *.o MAINTAINERCLEANFILES = $(DOMAIN).pot stamp-po $(MSGFILES) -EXTRA_DIST = remove-potcdate.sin LINGUAS $(POFILES) $(MSGFILES) +EXTRA_DIST = remove-potcdate.sed LINGUAS $(POFILES) $(MSGFILES) # Hidden from automake, but really activated. Works around an automake-1.5 bug. #distdir: distdir1 diff --git a/gettext-tools/examples/hello-tcl/autoclean.sh b/gettext-tools/examples/hello-tcl/autoclean.sh index f70a4c7f1..6f5fa67d4 100755 --- a/gettext-tools/examples/hello-tcl/autoclean.sh +++ b/gettext-tools/examples/hello-tcl/autoclean.sh @@ -11,7 +11,7 @@ rm -rf autom4te.cache rm -f m4/nls.m4 rm -f m4/po.m4 rm -f m4/progtest.m4 -rm -f po/remove-potcdate.sin +rm -f po/remove-potcdate.sed # Generated by aclocal. rm -f aclocal.m4 diff --git a/gettext-tools/examples/hello-tcl/autogen.sh b/gettext-tools/examples/hello-tcl/autogen.sh index 2b5e67b80..98187f3b2 100755 --- a/gettext-tools/examples/hello-tcl/autogen.sh +++ b/gettext-tools/examples/hello-tcl/autogen.sh @@ -26,7 +26,7 @@ fi cp -p ${ACLOCALDIR-$GETTEXT_TOPSRCDIR/gettext-runtime/m4}/nls.m4 m4/nls.m4 cp -p ${ACLOCALDIR-$GETTEXT_TOPSRCDIR/gettext-runtime/m4}/po.m4 m4/po.m4 cp -p ${ACLOCALDIR-$GETTEXT_TOPSRCDIR/gettext-runtime/m4}/progtest.m4 m4/progtest.m4 -cp -p ${GETTEXTSRCPODIR-$GETTEXT_TOPSRCDIR/gettext-runtime/po}/remove-potcdate.sin po/remove-potcdate.sin +cp -p ${GETTEXTSRCPODIR-$GETTEXT_TOPSRCDIR/gettext-runtime/po}/remove-potcdate.sed po/remove-potcdate.sed aclocal -I m4 diff --git a/gettext-tools/examples/hello-tcl/po/Makefile.am b/gettext-tools/examples/hello-tcl/po/Makefile.am index 744b40363..67891118f 100644 --- a/gettext-tools/examples/hello-tcl/po/Makefile.am +++ b/gettext-tools/examples/hello-tcl/po/Makefile.am @@ -134,7 +134,7 @@ $(srcdir)/stamp-po: $(srcdir)/$(DOMAIN).pot # The determination of whether the package xyz is a GNU one is based on the # heuristic whether some file in the top level directory mentions "GNU xyz". # If GNU 'find' is available, we avoid grepping through monster files. -$(DOMAIN).pot-update: $(POTFILES_DEPS) remove-potcdate.sed +$(DOMAIN).pot-update: $(POTFILES_DEPS) package_gnu="$(PACKAGE_GNU)"; \ test -n "$$package_gnu" || { \ if { if (LC_ALL=C find --version) 2>/dev/null | grep GNU >/dev/null; then \ @@ -186,8 +186,8 @@ $(DOMAIN).pot-update: $(POTFILES_DEPS) remove-potcdate.sed || exit 1; \ fi; \ if test -f $(srcdir)/$(DOMAIN).pot; then \ - sed -f remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot > $(DOMAIN).1po && \ - sed -f remove-potcdate.sed < $(DOMAIN).po > $(DOMAIN).2po && \ + sed -f $(srcdir)/remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot > $(DOMAIN).1po && \ + sed -f $(srcdir)/remove-potcdate.sed < $(DOMAIN).po > $(DOMAIN).2po && \ if cmp $(DOMAIN).1po $(DOMAIN).2po >/dev/null 2>&1; then \ rm -f $(DOMAIN).1po $(DOMAIN).2po $(DOMAIN).po; \ else \ @@ -258,14 +258,13 @@ uninstall-local-yes: html ID: MOSTLYCLEANFILES = -MOSTLYCLEANFILES += remove-potcdate.sed MOSTLYCLEANFILES += stamp-poT MOSTLYCLEANFILES += core core.* *.stackdump $(DOMAIN).po $(DOMAIN).1po $(DOMAIN).2po *.new.po MOSTLYCLEANFILES += *.o MAINTAINERCLEANFILES = $(DOMAIN).pot stamp-po $(MSGFILES) -EXTRA_DIST = remove-potcdate.sin LINGUAS $(POFILES) $(MSGFILES) +EXTRA_DIST = remove-potcdate.sed LINGUAS $(POFILES) $(MSGFILES) # Hidden from automake, but really activated. Works around an automake-1.5 bug. #distdir: distdir1 diff --git a/gettext-tools/examples/hello-ycp/autoclean.sh b/gettext-tools/examples/hello-ycp/autoclean.sh index 9367df26c..8655a8717 100755 --- a/gettext-tools/examples/hello-ycp/autoclean.sh +++ b/gettext-tools/examples/hello-ycp/autoclean.sh @@ -11,7 +11,7 @@ rm -rf autom4te.cache rm -f m4/nls.m4 rm -f m4/po.m4 rm -f m4/progtest.m4 -rm -f po/remove-potcdate.sin +rm -f po/remove-potcdate.sed # Generated by aclocal. rm -f aclocal.m4 diff --git a/gettext-tools/examples/hello-ycp/autogen.sh b/gettext-tools/examples/hello-ycp/autogen.sh index 7e5197991..a972da804 100755 --- a/gettext-tools/examples/hello-ycp/autogen.sh +++ b/gettext-tools/examples/hello-ycp/autogen.sh @@ -26,7 +26,7 @@ fi cp -p ${ACLOCALDIR-$GETTEXT_TOPSRCDIR/gettext-runtime/m4}/nls.m4 m4/nls.m4 cp -p ${ACLOCALDIR-$GETTEXT_TOPSRCDIR/gettext-runtime/m4}/po.m4 m4/po.m4 cp -p ${ACLOCALDIR-$GETTEXT_TOPSRCDIR/gettext-runtime/m4}/progtest.m4 m4/progtest.m4 -cp -p ${GETTEXTSRCPODIR-$GETTEXT_TOPSRCDIR/gettext-runtime/po}/remove-potcdate.sin po/remove-potcdate.sin +cp -p ${GETTEXTSRCPODIR-$GETTEXT_TOPSRCDIR/gettext-runtime/po}/remove-potcdate.sed po/remove-potcdate.sed aclocal -I m4 diff --git a/gettext-tools/examples/hello-ycp/po/Makefile.am b/gettext-tools/examples/hello-ycp/po/Makefile.am index 59b2b59d1..c8a3861a0 100644 --- a/gettext-tools/examples/hello-ycp/po/Makefile.am +++ b/gettext-tools/examples/hello-ycp/po/Makefile.am @@ -154,7 +154,7 @@ $(srcdir)/stamp-po: $(srcdir)/$(DOMAIN).pot # The determination of whether the package xyz is a GNU one is based on the # heuristic whether some file in the top level directory mentions "GNU xyz". # If GNU 'find' is available, we avoid grepping through monster files. -$(DOMAIN).pot-update: $(POTFILES_DEPS) remove-potcdate.sed +$(DOMAIN).pot-update: $(POTFILES_DEPS) package_gnu="$(PACKAGE_GNU)"; \ test -n "$$package_gnu" || { \ if { if (LC_ALL=C find --version) 2>/dev/null | grep GNU >/dev/null; then \ @@ -206,8 +206,8 @@ $(DOMAIN).pot-update: $(POTFILES_DEPS) remove-potcdate.sed || exit 1; \ fi; \ if test -f $(srcdir)/$(DOMAIN).pot; then \ - sed -f remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot > $(DOMAIN).1po && \ - sed -f remove-potcdate.sed < $(DOMAIN).po > $(DOMAIN).2po && \ + sed -f $(srcdir)/remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot > $(DOMAIN).1po && \ + sed -f $(srcdir)/remove-potcdate.sed < $(DOMAIN).po > $(DOMAIN).2po && \ if cmp $(DOMAIN).1po $(DOMAIN).2po >/dev/null 2>&1; then \ rm -f $(DOMAIN).1po $(DOMAIN).2po $(DOMAIN).po; \ else \ @@ -340,14 +340,13 @@ uninstall-local-yes: html ID: MOSTLYCLEANFILES = -MOSTLYCLEANFILES += remove-potcdate.sed MOSTLYCLEANFILES += stamp-poT MOSTLYCLEANFILES += core core.* *.stackdump $(DOMAIN).po $(DOMAIN).1po $(DOMAIN).2po *.new.po MOSTLYCLEANFILES += *.o MAINTAINERCLEANFILES = $(DOMAIN).pot stamp-po $(GMOFILES) -EXTRA_DIST = remove-potcdate.sin LINGUAS $(POFILES) $(GMOFILES) +EXTRA_DIST = remove-potcdate.sed LINGUAS $(POFILES) $(GMOFILES) # Hidden from automake, but really activated. Works around an automake-1.5 bug. #distdir: distdir1 diff --git a/gettext-tools/examples/po/Makefile.am b/gettext-tools/examples/po/Makefile.am index 42ba8c4c2..85c466e4b 100644 --- a/gettext-tools/examples/po/Makefile.am +++ b/gettext-tools/examples/po/Makefile.am @@ -1,5 +1,5 @@ ## Makefile for the gettext-tools/examples/po subdirectory of GNU gettext -## Copyright (C) 1995-2023 Free Software Foundation, Inc. +## Copyright (C) 1995-2024 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 @@ -203,7 +203,7 @@ $(srcdir)/stamp-po: $(srcdir)/$(DOMAIN).pot # This target rebuilds $(DOMAIN).pot; it is an expensive operation. # Note that $(DOMAIN).pot is not touched if it doesn't need to be changed. -$(DOMAIN).pot-update: $(POTFILES_DEPS) $(SMALLPOTS) remove-potcdate.sed +$(DOMAIN).pot-update: $(POTFILES_DEPS) $(SMALLPOTS) if test -n '$(MSGID_BUGS_ADDRESS)'; then \ msgid_bugs_address='$(MSGID_BUGS_ADDRESS)'; \ else \ @@ -218,8 +218,8 @@ $(DOMAIN).pot-update: $(POTFILES_DEPS) $(SMALLPOTS) remove-potcdate.sed $(SMALLPOTS) test ! -f $(DOMAIN).po || { \ if test -f $(srcdir)/$(DOMAIN).pot; then \ - sed -f remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot > $(DOMAIN).1po && \ - sed -f remove-potcdate.sed < $(DOMAIN).po > $(DOMAIN).2po && \ + sed -f $(srcdir)/remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot > $(DOMAIN).1po && \ + sed -f $(srcdir)/remove-potcdate.sed < $(DOMAIN).po > $(DOMAIN).2po && \ if cmp $(DOMAIN).1po $(DOMAIN).2po >/dev/null 2>&1; then \ rm -f $(DOMAIN).1po $(DOMAIN).2po $(DOMAIN).po; \ else \ @@ -353,14 +353,13 @@ $(POFILES): $(srcdir)/$(DOMAIN).pot html ID: MOSTLYCLEANFILES = -MOSTLYCLEANFILES += remove-potcdate.sed MOSTLYCLEANFILES += stamp-poT MOSTLYCLEANFILES += core core.* *.stackdump $(DOMAIN).po $(DOMAIN).1po $(DOMAIN).2po *.new.po MOSTLYCLEANFILES += *.o MAINTAINERCLEANFILES = $(DOMAIN).pot stamp-po $(SMALLPOTS) -EXTRA_DIST = remove-potcdate.sin xsmallpot.sh mmsmallpo.sh LINGUAS \ +EXTRA_DIST = remove-potcdate.sed xsmallpot.sh mmsmallpo.sh LINGUAS \ $(POFILES) # Hidden from automake, but really activated. Works around an automake-1.5 bug. diff --git a/gettext-tools/examples/po/remove-potcdate.sin b/gettext-tools/examples/po/remove-potcdate.sed similarity index 100% rename from gettext-tools/examples/po/remove-potcdate.sin rename to gettext-tools/examples/po/remove-potcdate.sed