Change gettextize to not create symlinks by default.

diff --git a/NEWS b/NEWS
index e4805b4c0c1f4bada0d2615a300376840f86fba4..ca1a60cf8f797b7d9c03ce239e591f2c8fdba0d6 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -29,6 +29,10 @@ Version 0.15.1 - October 2006
   files that are needed: gettext.m4, iconv.m4, lib-ld.m4, lib-link.m4,
   lib-prefix.m4, nls.m4, po.m4, progtest.m4.
 
+* gettextize no longer creates symbolic links by default; it makes file copies
+  instead.  The option --copy is removed.  You can get back the flawed
+  symlinking behaviour by specifying the --symlink option.
+
 * Autoconf macros:
   - The gettext autoconf macros now require autoconf 2.52 or newer.
   - A new autoconf macro AM_GNU_GETTEXT_INTL_SUBDIR is added. It allows to

diff --git a/gettext-tools/doc/ChangeLog b/gettext-tools/doc/ChangeLog
index ffd5740ea85b6d299eb69ef95844ed2f9726bcf8..0badacf36a50fc3c493c6987bf87fa747bd5055d 100644 (file)
--- a/gettext-tools/doc/ChangeLog
+++ b/gettext-tools/doc/ChangeLog
@@ -1,3 +1,8 @@
+2006-10-08  Bruno Haible  <bruno@clisp.org>
+
+       * gettextize.texi: Document the --symlink option instead of the --copy
+       option.
+
 2006-10-05  Bruno Haible  <bruno@clisp.org>
 
        * ISO_639: Add Adangme. Fix the names of Western Frisian, Galician,

diff --git a/gettext-tools/doc/gettextize.texi b/gettext-tools/doc/gettextize.texi
index def8bd2b14d9a129295c949bbe81dedd1fab3a46..eae9a2e97e93f5cfc9a7cb798b949441592053b3 100644 (file)
--- a/gettext-tools/doc/gettextize.texi
+++ b/gettext-tools/doc/gettextize.texi
@@ -43,16 +43,6 @@ gettextize [ @var{option}@dots{} ] [ @var{directory} ]
 and accepts the following options:
 
 @table @samp
-@item -c
-@itemx --copy
-@opindex -c@r{, @code{gettextize} option}
-@opindex --copy@r{, @code{gettextize} option}
-Copy the needed files instead of making symbolic links.  Using links
-would allow the package to always use the latest @code{gettext} code
-available on the system, but it might disturb some mechanism the
-maintainer is used to apply to the sources.  Because running
-@code{gettextize} is easy there shouldn't be problems with using copies.
-
 @item -f
 @itemx --force
 @opindex -f@r{, @code{gettextize} option}
@@ -74,6 +64,14 @@ Don't update or create ChangeLog files.  By default, @code{gettextize}
 logs all changes (file additions, modifications and removals) in a
 file called @samp{ChangeLog} in each affected directory.
 
+@item --symlink
+@opindex --symlink@r{, @code{gettextize} option}
+Make symbolic links instead of copying the needed files.  This can be
+useful to save a few kilobytes of disk space, but it requires extra
+effort to create self-contained tarballs, it may disturb some mechanism
+the maintainer applies to the sources, and it is likely to introduce
+bugs when a newer version of @code{gettext} is installed on the system.
+
 @item -n
 @itemx --dry-run
 @opindex -d@r{, @code{gettextize} option}

diff --git a/gettext-tools/misc/ChangeLog b/gettext-tools/misc/ChangeLog
index df30ff90758eab7a20b12ba431f15e5b68186edd..191dfe49595f83750cfd8e49e71d8f49d26cfda6 100644 (file)
--- a/gettext-tools/misc/ChangeLog
+++ b/gettext-tools/misc/ChangeLog
@@ -1,3 +1,10 @@
+2006-10-08  Bruno Haible  <bruno@clisp.org>
+
+       * gettextize.in (usage): Document the --symlink option instead of the
+       --copy option.
+       Accept a --symlink option.
+       (try_ln_s): Change default value to false.
+
 2006-10-01  Bruno Haible  <bruno@clisp.org>
 
        * gettextize.in (m4filelist): Add intldir.m4.

diff --git a/gettext-tools/misc/gettextize.in b/gettext-tools/misc/gettextize.in
index 9a33b26651b5512fa3f5c2e2f2bb2c461729fd6c..7cc5743428f86a2c8ae6a9b1c0b48d2d0ada2d1e 100644 (file)
--- a/gettext-tools/misc/gettextize.in
+++ b/gettext-tools/misc/gettextize.in
@@ -160,10 +160,10 @@ Prepares a source package to use gettext.
 Options:
       --help           print this help and exit
       --version        print version information and exit
-  -c, --copy           copy files instead of making symlinks
   -f, --force          force writing of new files even if old exist
       --intl           install libintl in a subdirectory
       --no-changelog   don't update or create ChangeLog files
+      --symlink        make symbolic links instead of copying files
   -n, --dry-run        print modifications but don't perform them
 
 Report bugs to <bug-gnu-gettext@gnu.org>."
@@ -196,21 +196,20 @@ func_fatal_error ()
 # Removes the OPTIONS from the arguments. Sets the variables:
 # - force           1 if --force was given, 0 otherwise
 # - intldir         yes if --intl was given, empty otherwise
-# - try_ln_s        false if --copy was given, : otherwise
+# - try_ln_s        : if --symlink was given, false otherwise
 # - do_changelog    false if --no-changelog was given, : otherwise
 # - doit            false if --dry-run was given, : otherwise
 {
   force=0
   intldir=
-  try_ln_s=:
+  try_ln_s=false
   do_changelog=:
   doit=:
 
   while test $# -gt 0; do
     case "$1" in
-      -c | --copy | --cop | --co | --c )
-        shift
-        try_ln_s=false ;;
+      -c | --copy | --cop | --co | --c ) # accepted for backward compatibility
+        shift ;;
       -n | --dry-run | --dry-ru | --dry-r | --dry- | --dry | --dr | --d )
         shift
         doit=false ;;
@@ -225,6 +224,9 @@ func_fatal_error ()
       --no-changelog | --no-changelo | --no-changel | --no-change | --no-chang | --no-chan | --no-cha | --no-ch | --no-c )
         shift
         do_changelog=false ;;
+      --symlink | --symlin | --symli | --syml | --sym | --sy | --s )
+        shift ;;
+        try_ln_s=: ;;
       --version | --versio | --versi | --vers | --ver | --ve | --v )
         func_version
         exit 0 ;;