autopoint: Rename gettext_dir to gettext_datadir

diff --git a/gettext-tools/misc/ChangeLog b/gettext-tools/misc/ChangeLog
index ba769c1f42b063913751f98b6049df80f6a2714d..978955b0cb1da14d99d841b400dff82ca7799137 100644 (file)
--- a/gettext-tools/misc/ChangeLog
+++ b/gettext-tools/misc/ChangeLog
@@ -1,3 +1,8 @@
+2014-04-21  Daiki Ueno  <ueno@gnu.org>
+
+       * autopoint.in: Rename gettext_dir to gettext_datadir.
+       * gettextize.in: Likewise.
+
 2014-03-27  Daiki Ueno  <ueno@gnu.org>
 
        autopoint: Use SED-based trace for non-standard Autoconf macros

diff --git a/gettext-tools/misc/autopoint.in b/gettext-tools/misc/autopoint.in
index 4d641a584764b12b7b817cb62c8274d6337946e9..b388c4b5aabc4d1185086b8bb5c0490a90bc9ede 100644 (file)
--- a/gettext-tools/misc/autopoint.in
+++ b/gettext-tools/misc/autopoint.in
@@ -25,10 +25,10 @@ package=@PACKAGE@
 version=@VERSION@
 
 # Set variables
-# - gettext_dir     directory where the sources are stored.
+# - gettext_datadir     directory where the data files are stored.
 prefix="@prefix@"
 datarootdir="@datarootdir@"
-: ${gettext_dir="@datadir@/gettext"}
+: ${gettext_datadir="@datadir@/gettext"}
 
 # func_tmpdir
 # creates a temporary directory.
@@ -133,7 +133,7 @@ if test "@RELOCATABLE@" = yes; then
   func_find_curr_installdir # determine curr_installdir
   func_find_prefixes
   # Relocate the directory variables that we use.
-  gettext_dir=`echo "$gettext_dir/" | sed -e "s%^${orig_installprefix}/%${curr_installprefix}/%" | sed -e 's,/$,,'`
+  gettext_datadir=`echo "$gettext_datadir/" | sed -e "s%^${orig_installprefix}/%${curr_installprefix}/%" | sed -e 's,/$,,'`
 fi
 
 # func_trace macro configure.ac
@@ -424,9 +424,9 @@ case "@ARCHIVE_FORMAT@" in
     # The archive of different versions is very large (unless xz compression is
     # used), but using it does not require special tools.
     case "@ARCHIVE_FORMAT@" in
-      dirgz) gzip -d -c < "$gettext_dir/archive.dir.tar.gz" ;;
-      dirbz2) bzip2 -d -c < "$gettext_dir/archive.dir.tar.bz2" ;;
-      dirxz) xz -d -c < "$gettext_dir/archive.dir.tar.xz" ;;
+      dirgz) gzip -d -c < "$gettext_datadir/archive.dir.tar.gz" ;;
+      dirbz2) bzip2 -d -c < "$gettext_datadir/archive.dir.tar.bz2" ;;
+      dirxz) xz -d -c < "$gettext_datadir/archive.dir.tar.xz" ;;
     esac \
       | (cd "$work_dir" && tar xf - "gettext-$ver")
     if test `find "$work_dir" -type f -print | wc -l` = 0; then
@@ -487,7 +487,7 @@ case "@ARCHIVE_FORMAT@" in
 
     # Set up a temporary CVS repository.
     # We need the temporary CVS repository because any checkout needs write
-    # access to the CVSROOT/history file, so it cannot be under $gettext_dir.
+    # access to the CVSROOT/history file, so it cannot be under $gettext_datadir.
     # We need the temporary checkout directory because when --force was not
     # given, we need to compare the existing files with the checked out ones.
     # Set variables
@@ -529,7 +529,7 @@ case "@ARCHIVE_FORMAT@" in
     # Need to pass -d "$CVSROOT", because there may be a CVS directory in the
     # current directory.
     cvs -d "$CVSROOT" init
-    gzip -d -c < "$gettext_dir/archive.cvs.tar.gz" | (cd "$cvs_dir" && tar xf -)
+    gzip -d -c < "$gettext_datadir/archive.cvs.tar.gz" | (cd "$cvs_dir" && tar xf -)
 
     cd "$work_dir"
     cvsver=gettext-`echo "$ver" | sed -e 's/\./_/g'`
@@ -553,7 +553,7 @@ case "@ARCHIVE_FORMAT@" in
     # Check availability of the git program.
     (git --version) >/dev/null 2>/dev/null || func_fatal_error "git program not found"
     mkdir "$work_dir/archive"
-    gzip -d -c < "$gettext_dir/archive.git.tar.gz" | (cd "$work_dir/archive" && tar xf -)
+    gzip -d -c < "$gettext_datadir/archive.git.tar.gz" | (cd "$work_dir/archive" && tar xf -)
     (cd "$work_dir/archive" && git checkout -q "gettext-$ver") || {
       rm -rf "$work_dir"
       func_fatal_error "infrastructure files for version $ver not found; this is autopoint from GNU $package $version"

diff --git a/gettext-tools/misc/gettextize.in b/gettext-tools/misc/gettextize.in
index 27ca7272cf2ad5e4b9363808c4c933163a1087ab..f4819448664f351c3c52a17d0cf43f2078562197 100644 (file)
--- a/gettext-tools/misc/gettextize.in
+++ b/gettext-tools/misc/gettextize.in
@@ -25,10 +25,10 @@ package=@PACKAGE@
 version=@VERSION@
 
 # Set variables
-# - gettext_dir     directory where the sources are stored.
+# - gettext_datadir     directory where the data files are stored.
 prefix="@prefix@"
 datarootdir="@datarootdir@"
-: ${gettext_dir="@datadir@/gettext"}
+: ${gettext_datadir="@datadir@/gettext"}
 
 # func_tmpdir
 # creates a temporary directory.
@@ -133,7 +133,7 @@ if test "@RELOCATABLE@" = yes; then
   func_find_curr_installdir # determine curr_installdir
   func_find_prefixes
   # Relocate the directory variables that we use.
-  gettext_dir=`echo "$gettext_dir/" | sed -e "s%^${orig_installprefix}/%${curr_installprefix}/%" | sed -e 's,/$,,'`
+  gettext_datadir=`echo "$gettext_datadir/" | sed -e "s%^${orig_installprefix}/%${curr_installprefix}/%" | sed -e 's,/$,,'`
 fi
 
 # func_trace macro configure.ac
@@ -365,8 +365,8 @@ for arg in $macrodirs; do
 done
 
 # For simplicity we change to the gettext source directory.
-cd "$gettext_dir" ||
-  func_fatal_error "gettext source directory '${gettext_dir}' doesn't exist"
+cd "$gettext_datadir" ||
+  func_fatal_error "gettext source directory '${gettext_datadir}' doesn't exist"
 
 # Variables which keep track what has been modified.
 added_directories=
@@ -661,7 +661,7 @@ test -d "$srcdir/$auxdir" || {
 for file in *; do
   case $file in
     ABOUT-NLS)
-      func_linkorcopy $file "$gettext_dir/$file" $file
+      func_linkorcopy $file "$gettext_datadir/$file" $file
       ;;
     config.rpath)
       if test -f "$srcdir/$auxdir$file"; then
@@ -669,7 +669,7 @@ for file in *; do
       else
         added_extradist="$added_extradist $auxdir$file"
       fi
-      func_linkorcopy $file "$gettext_dir/$file" "$auxdir$file"
+      func_linkorcopy $file "$gettext_datadir/$file" "$auxdir$file"
       ;;
   esac
 done
@@ -680,7 +680,7 @@ if test -n "$intldir"; then
   for file in *; do
     if test $file != COPYING.LIB-2.0 && test $file != COPYING.LIB-2.1; then
       if test $file != plural.c; then
-        func_linkorcopy $file "$gettext_dir/intl/$file" intl/$file
+        func_linkorcopy $file "$gettext_datadir/intl/$file" intl/$file
       else
         # plural.c is a generated file; it must be copied and touched.
         func_copy $file intl/$file
@@ -733,7 +733,7 @@ for podir in $podirs; do
       fi
     fi
     func_backup "$podir/$file"
-    func_linkorcopy $file "$gettext_dir/po/$file" "$podir/$file"
+    func_linkorcopy $file "$gettext_datadir/po/$file" "$podir/$file"
   done
   for file in *; do
     case $file in
@@ -741,7 +741,7 @@ for podir in $podirs; do
         # Already handled above.
         ;;
       Makevars.template)
-        func_linkorcopy Makevars.template "$gettext_dir/po/Makevars.template" "$podir/Makevars.template"
+        func_linkorcopy Makevars.template "$gettext_datadir/po/Makevars.template" "$podir/Makevars.template"
         if test -f "$srcdir/po/Makevars"; then
           LC_ALL=C sed -n -e 's/[      ]*\([A-Za-z0-9_]*\)[    ]*=.*/\1/p' < "$srcdir/$podir/Makevars" | LC_ALL=C sort > "$srcdir/$podir/Makevars.tmp1"
           LC_ALL=C sed -n -e 's/[      ]*\([A-Za-z0-9_]*\)[    ]*=.*/\1/p' < "$srcdir/$podir/Makevars.template" | LC_ALL=C sort > "$srcdir/$podir/Makevars.tmp2"
@@ -776,7 +776,7 @@ You can then remove $podir/Makevars.template.
           fi
         fi
         func_backup "$podir/$file"
-        func_linkorcopy $file "$gettext_dir/po/$file" "$podir/$file"
+        func_linkorcopy $file "$gettext_datadir/po/$file" "$podir/$file"
         ;;
     esac
   done
@@ -1302,7 +1302,7 @@ fi
 if $doit; then
   echo "$please"
   echo "You might also want to copy the convenience header file gettext.h"
-  echo "from the $gettext_dir directory into your package."
+  echo "from the $gettext_datadir directory into your package."
   echo "It is a wrapper around <libintl.h> that implements the configure --disable-nls"
   echo "option."
   echo

diff --git a/gettext-tools/tests/ChangeLog b/gettext-tools/tests/ChangeLog
index 636065112da9e2dd4ff35cca58d1347c2cd095f2..13d10d280ae71c24bfad73dbcde7810f608ce051 100644 (file)
--- a/gettext-tools/tests/ChangeLog
+++ b/gettext-tools/tests/ChangeLog
@@ -1,3 +1,9 @@
+2014-04-21  Daiki Ueno  <ueno@gnu.org>
+
+       * autopoint-1 (gettext_datadir): Rename from gettext_dir.
+       * autopoint-2 (gettext_datadir): Likewise.
+       * autopoint-3 (gettext_datadir): Likewise.
+
 2014-04-15  Daiki Ueno  <ueno@gnu.org>
 
        tests: Add tests for 'msgfilter quot' and 'msgfilter boldquot'

diff --git a/gettext-tools/tests/autopoint-1 b/gettext-tools/tests/autopoint-1
index df13369aadd692e476eb321293438f1a8283be89..357faba191fc90f03a657c7c4649301e96980cb3 100755 (executable)
--- a/gettext-tools/tests/autopoint-1
+++ b/gettext-tools/tests/autopoint-1
@@ -16,13 +16,13 @@ ${AUTOCONF} >/dev/null 2>/dev/null \
 
 rm -f configure.ac
 
-gettext_dir=$top_builddir/misc
-export gettext_dir
+gettext_datadir=$top_builddir/misc
+export gettext_datadir
 
 # Check if sanity checks are actually working.
 
 # no configure.ac
-$gettext_dir/autopoint 2>&1 | grep -q 'Missing configure.in or configure.ac' \
+$gettext_datadir/autopoint 2>&1 | grep -q 'Missing configure.in or configure.ac' \
     || exit 1
 
 test ! -d intl || exit 1
@@ -40,7 +40,7 @@ AC_CONFIG_FILES([Makefile])
 AC_OUTPUT
 EOF
 
-$gettext_dir/autopoint 2>&1 | grep -q 'Missing version' \
+$gettext_datadir/autopoint 2>&1 | grep -q 'Missing version' \
     || exit 1
 
 test ! -d intl || exit 1
@@ -61,7 +61,7 @@ EOF
 test -d intl || mkdir intl
 echo bogus-version > intl/VERSION
 
-$gettext_dir/autopoint 2>&1 | grep -q 'Missing version' \
+$gettext_datadir/autopoint 2>&1 | grep -q 'Missing version' \
     || exit 1
 
 test ! -d m4 || exit 1
@@ -81,7 +81,7 @@ EOF
 test -d intl || mkdir intl
 echo gettext-0.15 > intl/VERSION
 
-$gettext_dir/autopoint 2>&1 | grep -q 'locally modified' || exit 1
+$gettext_datadir/autopoint 2>&1 | grep -q 'locally modified' || exit 1
 
 test ! -d m4 || exit 1
 test ! -d po || exit 1

diff --git a/gettext-tools/tests/autopoint-2 b/gettext-tools/tests/autopoint-2
index 294765c8392f242f1386b8f8a3d66f026aae1665..de0708f275f4b60fbf19348a4d5a25f71ff3ffee 100755 (executable)
--- a/gettext-tools/tests/autopoint-2
+++ b/gettext-tools/tests/autopoint-2
@@ -18,8 +18,8 @@ ${AUTOCONF} >/dev/null 2>/dev/null \
 
 rm -f configure.ac
 
-gettext_dir=$top_builddir/misc
-export gettext_dir
+gettext_datadir=$top_builddir/misc
+export gettext_datadir
 
 # Check for not copying libintl source.
 cat <<EOF >configure.ac
@@ -35,7 +35,7 @@ AC_CONFIG_FILES([po/Makefile.in])
 AC_OUTPUT
 EOF
 
-$gettext_dir/autopoint >/dev/null 2>/dev/null || exit 1
+$gettext_datadir/autopoint >/dev/null 2>/dev/null || exit 1
 
 test ! -d intl || exit 1
 test -d m4 || exit 1
@@ -60,7 +60,7 @@ AC_CONFIG_FILES([po/Makefile.in])
 AC_OUTPUT
 EOF
 
-$gettext_dir/autopoint >/dev/null 2>/dev/null || exit 1
+$gettext_datadir/autopoint >/dev/null 2>/dev/null || exit 1
 
 test -d intl || exit 1
 test -d m4 || exit 1
@@ -92,7 +92,7 @@ AC_CONFIG_FILES([po/Makefile.in])
 AC_OUTPUT
 EOF
 
-$gettext_dir/autopoint >/dev/null 2>/dev/null || exit 1
+$gettext_datadir/autopoint >/dev/null 2>/dev/null || exit 1
 
 test ! -d intl || exit 1
 test ! -d m4 || exit 1
@@ -119,7 +119,7 @@ AC_CONFIG_FILES([po/Makefile.in])
 AC_OUTPUT
 EOF
 
-$gettext_dir/autopoint >/dev/null 2>/dev/null || exit 1
+$gettext_datadir/autopoint >/dev/null 2>/dev/null || exit 1
 
 test ! -d intl || exit 1
 test -d m4 || exit 1

diff --git a/gettext-tools/tests/autopoint-3 b/gettext-tools/tests/autopoint-3
index e695f3f9ec00c203c94549c83d3d92703baf9681..8ea619be8848626c6bdced4d860267d1ddd1a3d7 100755 (executable)
--- a/gettext-tools/tests/autopoint-3
+++ b/gettext-tools/tests/autopoint-3
@@ -44,8 +44,8 @@ rm -f configure.ac Makefile.am
 ${MAKE} --version >/dev/null 2>/dev/null \
   || { echo "Skipping test: make not found"; exit 77; }
 
-gettext_dir=$top_builddir/misc
-export gettext_dir
+gettext_datadir=$top_builddir/misc
+export gettext_datadir
 
 cat <<EOF >configure.ac
 AC_CONFIG_MACRO_DIR([m4])
@@ -92,7 +92,7 @@ EOF
 cp -p "$abs_top_srcdir"/gnulib-lib/gettext.h .
 cp -p "$abs_top_srcdir"/examples/hello-c/hello.c .
 
-$gettext_dir/autopoint -f >/dev/null 2>/dev/null || exit 1
+$gettext_datadir/autopoint -f >/dev/null 2>/dev/null || exit 1
 
 test -d intl || exit 1
 test -d m4 || exit 1