plural.c gets installed now.

diff --git a/intl/ChangeLog b/intl/ChangeLog
index ae5608de498eda94130fafd9b5b8d34b4b33f344..f9dd64c3a90f25ce85a9c061f55dfd4b1b83f774 100644 (file)
--- a/intl/ChangeLog
+++ b/intl/ChangeLog
@@ -1,3 +1,8 @@
+2001-05-22  Bruno Haible  <haible@clisp.cons.org>
+
+       * Makefile.in (install-data): Install plural.c as well.
+       (uninstall): Uninstall plural.c as well.
+
 2001-05-18  Bruno Haible  <haible@clisp.cons.org>
 
        * Makefile.in (dist): Don't assume $(srcdir) = ".". Distribute

diff --git a/intl/Makefile.in b/intl/Makefile.in
index 078be485f89ff868a14f8a9c96e41e4b190c6679..889ba23923c09a3b0c056b2593cb92d168db5b67 100644 (file)
--- a/intl/Makefile.in
+++ b/intl/Makefile.in
@@ -190,6 +190,12 @@ install-data: all
                            $(DESTDIR)$(gettextsrcdir)/$$file; \
          done; \
          chmod a+x $(DESTDIR)$(gettextsrcdir)/config.charset; \
+         dists="$(DISTFILES.generated)"; \
+         for file in $$dists; do \
+           if test -f $$file; then dir=.; else dir=$(srcdir); fi; \
+           $(INSTALL_DATA) $$dir/$$file \
+                           $(DESTDIR)$(gettextsrcdir)/$$file; \
+         done; \
          dists="$(DISTFILES.obsolete)"; \
          for file in $$dists; do \
            rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \
@@ -237,7 +243,7 @@ uninstall:
          : ; \
        fi
        if test "$(PACKAGE)" = "gettext"; then \
-         for file in VERSION ChangeLog $(DISTFILES.common); do \
+         for file in VERSION ChangeLog $(DISTFILES.common) $(DISTFILES.generated); do \
            rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \
          done; \
        else \

diff --git a/misc/ChangeLog b/misc/ChangeLog
index 428d1f537c8f77f2abbcd42b7440e23780561311..900e1c1339f9d2c7a10b4aa1cffe776b27447afc 100644 (file)
--- a/misc/ChangeLog
+++ b/misc/ChangeLog
@@ -1,3 +1,7 @@
+2001-05-22  Bruno Haible  <haible@clisp.cons.org>
+
+       * gettextize.in: Copy plural.c and touch it afterwards.
+
 2001-05-21  Alexandre Duret-Lutz  <duret_g@epita.fr>
 
        * gettextize.in: Check for configure.ac in addition to configure.in.

diff --git a/misc/gettextize.in b/misc/gettextize.in
index 2c1e727a6727f9bb0990ac93cf3285361f8397e8..a28ac357bbbd1d80cbc720f28c1c1cf9626d79d5 100644 (file)
--- a/misc/gettextize.in
+++ b/misc/gettextize.in
@@ -160,8 +160,14 @@ done
 cd intl
 for file in *; do
   rm -f $srcdir/intl/$file
-  ($try_ln_s && ln -s $gettext_dir/intl/$file $srcdir/intl/$file && $echo "Symlinking file intl/$file") 2>/dev/null ||
-  { $echo "Copying file intl/$file"; cp $file $srcdir/intl/$file; }
+  if test $file != plural.c; then
+    ($try_ln_s && ln -s $gettext_dir/intl/$file $srcdir/intl/$file && $echo "Symlinking file intl/$file") 2>/dev/null ||
+    { $echo "Copying file intl/$file"; cp $file $srcdir/intl/$file; }
+  else
+    # plural.c is a generated file; it must be copied and touched.
+    $echo "Copying file intl/$file"; cp $file $srcdir/intl/$file
+    sleep 2; touch $srcdir/intl/$file
+  fi
 done
 
 # Copy files to po/ subdirectory.