Fixes for "make dist".

diff --git a/gettext-tools/examples/ChangeLog b/gettext-tools/examples/ChangeLog
index 335543165736c520b3ef2c09c70eae6cb36ab2fa..f96542928090c2c975bc67d473592efaa9bd6374 100644 (file)
--- a/gettext-tools/examples/ChangeLog
+++ b/gettext-tools/examples/ChangeLog
@@ -1,3 +1,14 @@
+2004-01-17  Bruno Haible  <bruno@clisp.org>
+
+       * po/Makefile.am (POTFILES): Add hello-csharp, hello-csharp-forms
+       sources.
+       (SMALLPOTS): Add hello-csharp.pot, hello-csharp-forms.pot.
+       (hello-csharp.pot, hello-csharp-forms.pot): New rules.
+       (SMALLPOFILES_FOR_lang): Add hello-csharp, hello-csharp-forms elements.
+       (../hello-csharp/po/$(LL).po, ../hello-csharp-forms/po/$(LL).po): New
+       rules.
+       * po/mmsmallpo.sh: Use option --force-po.
+
 2004-01-17  Bruno Haible  <bruno@clisp.org>
 
        * hello-*/po/Makefile.am: Adapt to changes made in po/Makefile.in.in.

diff --git a/gettext-tools/examples/po/Makefile.am b/gettext-tools/examples/po/Makefile.am
index 9d06d23e22b7d5f0c9108a6d475c353eeeee9314..b954657453a8d5693ecb6e0deb60dfabe86e7561 100644 (file)
--- a/gettext-tools/examples/po/Makefile.am
+++ b/gettext-tools/examples/po/Makefile.am
@@ -44,6 +44,8 @@ POTFILES = \
   examples/hello-java/Hello.java \
   examples/hello-java-awt/Hello.java \
   examples/hello-java-swing/Hello.java \
+  examples/hello-csharp/hello.cs \
+  examples/hello-csharp-forms/hello.cs \
   examples/hello-gawk/hello.awk \
   examples/hello-pascal/hello.pas \
   examples/hello-ycp/hello.ycp \
@@ -72,6 +74,8 @@ SMALLPOTS = \
   hello-java.pot \
   hello-java-awt.pot \
   hello-java-swing.pot \
+  hello-csharp.pot \
+  hello-csharp-forms.pot \
   hello-gawk.pot \
   hello-pascal.pot \
   hello-ycp.pot \
@@ -235,6 +239,12 @@ hello-java-awt.pot : $(POTFILES_DEPS)
 hello-java-swing.pot : $(POTFILES_DEPS)
        $(SHELL) xsmallpot.sh hello-java-swing
 
+hello-csharp.pot : $(POTFILES_DEPS)
+       $(SHELL) xsmallpot.sh hello-csharp
+
+hello-csharp-forms.pot : $(POTFILES_DEPS)
+       $(SHELL) xsmallpot.sh hello-csharp-forms
+
 hello-gawk.pot : $(POTFILES_DEPS)
        $(SHELL) xsmallpot.sh hello-gawk
 
@@ -346,6 +356,8 @@ SMALLPOFILES_FOR_lang = \
   ../hello-java/po/$$lang.po \
   ../hello-java-awt/po/$$lang.po \
   ../hello-java-swing/po/$$lang.po \
+  ../hello-csharp/po/$$lang.po \
+  ../hello-csharp-forms/po/$$lang.po \
   ../hello-gawk/po/$$lang.po \
   ../hello-pascal/po/$$lang.po \
   ../hello-ycp/po/$$lang.po \
@@ -405,6 +417,12 @@ SMALLPOFILES_FOR_lang = \
 ../hello-java-swing/po/$(LL).po: hello-java-swing.pot $(LL).po
        $(SHELL) mmsmallpo.sh hello-java-swing $(LL)
 
+../hello-csharp/po/$(LL).po: hello-csharp.pot $(LL).po
+       $(SHELL) mmsmallpo.sh hello-csharp $(LL)
+
+../hello-csharp-forms/po/$(LL).po: hello-csharp-forms.pot $(LL).po
+       $(SHELL) mmsmallpo.sh hello-csharp-forms $(LL)
+
 ../hello-gawk/po/$(LL).po: hello-gawk.pot $(LL).po
        $(SHELL) mmsmallpo.sh hello-gawk $(LL)
 

diff --git a/gettext-tools/examples/po/mmsmallpo.sh b/gettext-tools/examples/po/mmsmallpo.sh
index c9204d1ff5c313f41369603b9715ba1c2c482dd3..0faedd807469d89b444cd487cc96bfed5b47f9e3 100755 (executable)
--- a/gettext-tools/examples/po/mmsmallpo.sh
+++ b/gettext-tools/examples/po/mmsmallpo.sh
@@ -7,7 +7,7 @@ test $# = 2  || { echo "Usage: mmsmallpo.sh hello-foo ll" 1>&2; exit 1; }
 directory=$1
 language=$2
 
-msgmerge $language.po $directory.pot -o - | \
+msgmerge --force-po $language.po $directory.pot -o - | \
 msgattrib --no-obsolete | \
 sed -e "s, $directory/, ,g" | sed -e "s,gettext-examples,$directory," | \
 sed -e '/^"POT-Creation-Date: .*"$/{