Distribute two examples for Perl, not just one.

diff --git a/gettext-tools/examples/ChangeLog b/gettext-tools/examples/ChangeLog
index 158f8898ef66bcbf0fcd94b1a33fc584292b7e37..058d5a98853da459fe690702f1c9aa270f5b857f 100644 (file)
--- a/gettext-tools/examples/ChangeLog
+++ b/gettext-tools/examples/ChangeLog
@@ -1,3 +1,14 @@
+2003-12-07  Bruno Haible  <bruno@clisp.org>
+
+       * hello-perl/hello-1.pl.in: Renamed from hello-perl/hello.pl. Make it
+       work.
+       * hello-perl/hello-2.pl.in: New file, from Guido Flohr.
+       * hello-perl/po/Makefile.am (POTFILES): Update.
+       (XGETTEXT_OPTIONS): Add options needed for the Locale::TextDomain API.
+       * hello-perl/configure.ac: Update accordingly.
+       * hello-perl/Makefile.am: Update accordingly.
+       * Makefile.am (EXAMPLESFILES): Update.
+
 2003-12-06  Bruno Haible  <bruno@clisp.org>
 
        * hello-objc-gnustep/po/LocaleAliases: Add many new locales. Fix typo

diff --git a/gettext-tools/examples/Makefile.am b/gettext-tools/examples/Makefile.am
index b26781058c3606819675c36be2c20c1339c31c19..c3d6683863aa3a81702a76685ad684aaffd3f13d 100644 (file)
--- a/gettext-tools/examples/Makefile.am
+++ b/gettext-tools/examples/Makefile.am
@@ -484,7 +484,8 @@ EXAMPLESFILES = \
   hello-perl/INSTALL \
   hello-perl/autogen.sh \
   hello-perl/autoclean.sh \
-  hello-perl/hello.pl \
+  hello-perl/hello-1.pl.in \
+  hello-perl/hello-2.pl.in \
   hello-perl/Makefile.am \
   hello-perl/configure.ac \
   hello-perl/m4/Makefile.am \

diff --git a/gettext-tools/examples/hello-perl/Makefile.am b/gettext-tools/examples/hello-perl/Makefile.am
index 212d2a8e775782a944764d54fb278147dcb269b9..9a9636955e433561b3846b5730d70bfcd90850c1 100644 (file)
--- a/gettext-tools/examples/hello-perl/Makefile.am
+++ b/gettext-tools/examples/hello-perl/Makefile.am
@@ -12,7 +12,7 @@ ACLOCAL_AMFLAGS = -I m4
 SUBDIRS = m4 po
 
 # The list of programs that are built.
-bin_SCRIPTS = hello
+bin_SCRIPTS = hello-1 hello-2
 
 # Additional files to be distributed.
 EXTRA_DIST = autogen.sh autoclean.sh

diff --git a/gettext-tools/examples/hello-perl/configure.ac b/gettext-tools/examples/hello-perl/configure.ac
index 6d5b64fc48f8f116a6aafb635c158afb128e0613..d2986e1d837c7c55960487fea240e19f9701f8fe 100644 (file)
--- a/gettext-tools/examples/hello-perl/configure.ac
+++ b/gettext-tools/examples/hello-perl/configure.ac
@@ -5,7 +5,7 @@ dnl
 dnl Configuration file - processed by autoconf.
 
 AC_INIT
-AC_CONFIG_SRCDIR(hello.pl)
+AC_CONFIG_SRCDIR(hello-1.pl.in)
 AM_INIT_AUTOMAKE(hello-perl, 0)
 
 dnl Check for availability of the Perl interpreter.
@@ -33,7 +33,8 @@ dnl Support for the po directory.
 AM_PO_SUBDIRS
 
 AC_CONFIG_FILES([Makefile])
-AC_CONFIG_FILES([hello:hello.pl], [chmod a+x hello])
+AC_CONFIG_FILES([hello-1:hello-1.pl.in], [chmod a+x hello-1])
+AC_CONFIG_FILES([hello-2:hello-2.pl.in], [chmod a+x hello-2])
 AC_CONFIG_FILES([m4/Makefile])
 AC_CONFIG_FILES([po/Makefile], [AM_POSTPROCESS_PO_MAKEFILE])
 AC_OUTPUT

diff --git a/gettext-tools/examples/hello-perl/po/Makefile.am b/gettext-tools/examples/hello-perl/po/Makefile.am
index 560e998e67ada78827a5e312856896a1de804b2d..6025b20275bb246c77a7390c8e84a9df28f13dc6 100644 (file)
--- a/gettext-tools/examples/hello-perl/po/Makefile.am
+++ b/gettext-tools/examples/hello-perl/po/Makefile.am
@@ -6,14 +6,23 @@
 
 # List of files which contain translatable strings.
 POTFILES = \
-  hello.pl
+  hello-1.pl.in hello-2.pl.in
 
 # Usually the message domain is the same as the package name.
 DOMAIN = $(PACKAGE)
 
 # These options get passed to xgettext.
 XGETTEXT_OPTIONS = \
-  -k_ --flag=_:1:pass-perl-format --flag=_:1:pass-perl-brace-format
+  -k_ --flag=_:1:pass-perl-format --flag=_:1:pass-perl-brace-format \
+  -k__ --flag=__:1:pass-perl-format --flag=__:1:pass-perl-brace-format \
+  -k'$$__' --flag='$$__:1:pass-perl-format' --flag='$$__:1:pass-perl-brace-format' \
+  -k'%__' --flag=%__:1:pass-perl-format --flag=%__:1:pass-perl-brace-format \
+  -k__x --flag=__x:1:perl-brace-format \
+  -k__n:1,2 --flag=__n:1:pass-perl-format --flag=__n:1:pass-perl-brace-format \
+            --flag=__n:2:pass-perl-format --flag=__n:2:pass-perl-brace-format \
+  -k__nx:1,2 --flag=__nx:1:perl-brace-format --flag=__nx:2:perl-brace-format \
+  -k__xn:1,2 --flag=__xn:1:perl-brace-format --flag=__xn:2:perl-brace-format \
+  -kN__ --flag=N__:1:pass-perl-format --flag=N__:1:pass-perl-brace-format
 
 # This is the copyright holder that gets inserted into the header of the
 # $(DOMAIN).pot file.  Set this to the copyright holder of the surrounding