From 54f43cc00b3782c3055d554a8badf6f579d7c070 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Thu, 17 Jan 2002 12:46:32 +0000 Subject: [PATCH] Handle po/Makevars specially. --- misc/ChangeLog | 5 +++++ misc/gettextize.in | 24 +++++++++++++++++++++--- 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/misc/ChangeLog b/misc/ChangeLog index 56f53f790..75df61ede 100644 --- a/misc/ChangeLog +++ b/misc/ChangeLog @@ -1,3 +1,8 @@ +2002-01-15 Bruno Haible + + * gettextize.in: Handle po/Makevars specially, don't overwrite the + previous customizations. + 2002-01-12 Bruno Haible * gettextize.in: Update year in --version output. diff --git a/misc/gettextize.in b/misc/gettextize.in index 418e2068c..febc7ba05 100644 --- a/misc/gettextize.in +++ b/misc/gettextize.in @@ -198,9 +198,27 @@ fi # Copy files to po/ subdirectory. cd po for file in *; do - rm -f $srcdir/po/$file - ($try_ln_s && ln -s $gettext_dir/po/$file $srcdir/po/$file && $echo "Symlinking file po/$file") 2>/dev/null || - { $echo "Copying file po/$file"; cp $file $srcdir/po/$file; } + case $file in + Makevars) + rm -f $srcdir/po/$file.template + ($try_ln_s && ln -s $gettext_dir/po/$file $srcdir/po/$file.template && $echo "Symlinking file po/$file.template") 2>/dev/null || + { $echo "Copying file po/$file.template"; cp $file $srcdir/po/$file.template; } + if test -f $srcdir/po/$file; then + echo "Please update po/$file so that it defines all the variables mentioned" + echo "in po/$file.template." + else + echo "Please create po/$file from the template in po/$file.template." + fi + echo "You can then remove po/$file.template." + ;; + *) + rm -f $srcdir/po/$file~ + cp -p $srcdir/po/$file $srcdir/po/$file~ + rm -f $srcdir/po/$file + ($try_ln_s && ln -s $gettext_dir/po/$file $srcdir/po/$file && $echo "Symlinking file po/$file") 2>/dev/null || + { $echo "Copying file po/$file"; cp $file $srcdir/po/$file; } + ;; + esac done DATE=`date +%Y-%m-%d` cat > $srcdir/po/ChangeLog.tmp <