From: Bruno Haible <bruno@clisp.org>
Date: Tue, 16 Oct 2018 01:14:41 +0000 (+0200)
Subject: examples: hello-pascal: Update.
X-Git-Tag: v0.20~348
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=92be721ad873c9c1d0dc4360ac72c5f9db86822f;p=thirdparty%2Fgettext.git

examples: hello-pascal: Update.

* gettext-tools/examples/hello-pascal/configure.ac (PPC): Test for ppcx64 if
ppc386 is not found.
* gettext-tools/examples/hello-pascal/hello.rst: Remove file.
* gettext-tools/examples/hello-pascal/Makefile.am: hello.rsj replaces hello.rst.
(SUBDIRS): Proceed in current directory before recursing into po/.
* gettext-tools/examples/hello-pascal/po/Makefile.am (POTFILES): hello.rsj
replaces hello.rst.
* gettext-tools/examples/hello-pascal/autoclean.sh: Remove hello.rsj.
---

diff --git a/gettext-tools/examples/hello-pascal/Makefile.am b/gettext-tools/examples/hello-pascal/Makefile.am
index 41b73c678..10547bb51 100644
--- a/gettext-tools/examples/hello-pascal/Makefile.am
+++ b/gettext-tools/examples/hello-pascal/Makefile.am
@@ -8,7 +8,7 @@ AUTOMAKE_OPTIONS = foreign
 ACLOCAL_AMFLAGS = -I m4
 
 # The list of subdirectories containing Makefiles.
-SUBDIRS = m4 po
+SUBDIRS = m4 . po
 
 # The list of programs that are built.
 bin_PASCALPROGRAMS = hello
@@ -24,7 +24,7 @@ EXTRA_DIST = autogen.sh autoclean.sh
 all-local: hello$(EXEEXT)
 
 # How to build the 'hello' program.
-hello$(EXEEXT) hello.rst: $(hello_SOURCES)
+hello$(EXEEXT) hello.rsj: $(hello_SOURCES)
 	LOCALEDIR='@localedir@' $(PPC) $(hello_SOURCES)
 
 install-exec-local: all-local
@@ -37,9 +37,9 @@ installdirs-local:
 uninstall-local:
 	rm -f $(DESTDIR)$(bindir)/hello$(EXEEXT)
 
-# Distribute the RST file because it's needed to generate POT files and can
+# Distribute the RSJ file because it's needed to generate POT files and can
 # only be rebuilt on those platforms to which the Pascal compiler is ported.
-EXTRA_DIST += hello.rst
+EXTRA_DIST += hello.rsj
 
 # The list of auxiliary files generated during the compilation.
 CLEANFILES = hello.o hello$(EXEEXT)
diff --git a/gettext-tools/examples/hello-pascal/autoclean.sh b/gettext-tools/examples/hello-pascal/autoclean.sh
index 9367df26c..94c009111 100755
--- a/gettext-tools/examples/hello-pascal/autoclean.sh
+++ b/gettext-tools/examples/hello-pascal/autoclean.sh
@@ -25,6 +25,7 @@ rm -f m4/Makefile.in
 rm -f po/Makefile.in
 rm -f install-sh
 rm -f missing
+rm -f hello.rsj
 rm -f po/*.pot
 rm -f po/stamp-po
 rm -f po/*.gmo
diff --git a/gettext-tools/examples/hello-pascal/configure.ac b/gettext-tools/examples/hello-pascal/configure.ac
index 76920b877..37fd52216 100644
--- a/gettext-tools/examples/hello-pascal/configure.ac
+++ b/gettext-tools/examples/hello-pascal/configure.ac
@@ -8,9 +8,9 @@ AC_CONFIG_SRCDIR(hello.pas)
 AM_INIT_AUTOMAKE(hello-pascal, 0)
 
 dnl Check for availability of the Free Pascal Compiler.
-AC_PATH_PROG(PPC, ppc386)
+AC_PATH_PROGS(PPC, ppc386 ppcx64)
 if test -z "$PPC"; then
-  echo "*** Essential program ppc386 not found" 1>&2
+  echo "*** Essential program ppc386 or ppcx64 not found" 1>&2
   exit 1
 fi
 AC_SUBST(PPC)
diff --git a/gettext-tools/examples/hello-pascal/hello.rst b/gettext-tools/examples/hello-pascal/hello.rst
deleted file mode 100644
index 9f04be6fd..000000000
--- a/gettext-tools/examples/hello-pascal/hello.rst
+++ /dev/null
@@ -1,8 +0,0 @@
-
-# hash value = 153469889
-hello.hello_world='Hello, world!'
-
-
-# hash value = 1323310
-hello.running_as='This program is running as process number %d.'
-
diff --git a/gettext-tools/examples/hello-pascal/po/Makefile.am b/gettext-tools/examples/hello-pascal/po/Makefile.am
index 2419479b3..6739e057e 100644
--- a/gettext-tools/examples/hello-pascal/po/Makefile.am
+++ b/gettext-tools/examples/hello-pascal/po/Makefile.am
@@ -5,7 +5,7 @@
 
 # List of files which contain translatable strings.
 POTFILES = \
-  hello.rst
+  hello.rsj
 
 # Usually the message domain is the same as the package name.
 DOMAIN = $(PACKAGE)