Keep RCS and CVS subdirs in intl, don't erase them.

diff --git a/misc/ChangeLog b/misc/ChangeLog
index 97f90c3287b5f24c861532ec20a85ce819df2f42..8569f56f9c98d0ed9246c535591b9a47aa670468 100644 (file)
--- a/misc/ChangeLog
+++ b/misc/ChangeLog
@@ -1,3 +1,10 @@
+2000-12-08  Bruno Haible  <haible@clisp.cons.org>
+
+       * gettextize.in: Preserve RCS and CVS subdirs in intl/.
+       Reported by Santiago Vila <sanvila@unex.es>.
+
+       * gettextize.in: Test for ABOUT-NLS, not NLS.
+
 2000-10-26  GOTO Masanori  <gotom@debian.or.jp>
 
        * locale.alias: Add ja_JP.ujis alias.

diff --git a/misc/gettextize.in b/misc/gettextize.in
index 75e3c2e329c25f6396d0596c70bdd876b09fc128..4eb8fbf9659990c7cc0b654b72cf9be37d3d3729 100644 (file)
--- a/misc/gettextize.in
+++ b/misc/gettextize.in
@@ -1,6 +1,6 @@
 #! /bin/sh
 #
-# Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
+# Copyright (C) 1995, 1996, 1997, 1998, 2000 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
@@ -107,11 +107,28 @@ po/Makefile.in.in exists: use option -f if you really want to delete it."
   exit 1
 fi
 
-if test -f NLS && test $force -eq 0; then
-  $echo "NLS exists: use option -f if you really want to delete it."
+if test -f ABOUT-NLS && test $force -eq 0; then
+  $echo "ABOUT-NLS exists: use option -f if you really want to delete it."
   exit 1
 fi
 
+if test -d intl; then
+  # Remove everything inside intl except for RCS and CVS subdirs and invisible
+  # files.
+  (cd intl &&
+   for f in *; do
+     if test CVS != "$f" && test RCS != "$f"; then
+       rm -rf "$f"
+     fi
+   done)
+else
+  rm -f intl
+  mkdir intl || {
+    $echo "failed to create intl/ subdirectory"
+    exit 1;
+  }
+fi
+
 rm -fr intl
 mkdir intl || {
   $echo "failed to create intl/ subdirectory"