Create the sed scripts in the correct directory.

diff --git a/m4/ChangeLog b/m4/ChangeLog
index cabd55bbfcfe7875ffb4c547a24a7fddb809af22..fb98bcefc4642e20673104b306ada89b3a7c7ce0 100644 (file)
--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,3 +1,8 @@
+2000-07-28  Bruno Haible  <haible@clisp.cons.org>
+
+       * gettext.m4 (AM_GNU_GETTEXT): The sed scripts are in $srcdir/intl,
+       and po2msg.sed, po2tbl.sed must be created in the intl subdir.
+
 2000-06-16  Bruno Haible  <haible@clisp.cons.org>
 
        * codeset.m4: New file, taken from fileutils-4.0u, with prefix AM.

diff --git a/m4/gettext.m4 b/m4/gettext.m4
index d16262506fec8cf6e8945d46df0babfcf5c11c6d..9fb329f8563351b5ff31480fd72c3ffa1e20527d 100644 (file)
--- a/m4/gettext.m4
+++ b/m4/gettext.m4
@@ -265,19 +265,17 @@ __argz_count __argz_stringify __argz_next])
    dnl Determine which catalog format we have (if any is needed)
    dnl For now we know about two different formats:
    dnl   Linux libc-5 and the normal X/Open format
-   if test -f $srcdir/po2tbl.sed.in; then
-      test -d intl || mkdir intl
-      if test "$CATOBJEXT" = ".cat"; then
-       AC_CHECK_HEADER(linux/version.h, msgformat=linux, msgformat=xopen)
+   test -d intl || mkdir intl
+   if test "$CATOBJEXT" = ".cat"; then
+     AC_CHECK_HEADER(linux/version.h, msgformat=linux, msgformat=xopen)
 
-       dnl Transform the SED scripts while copying because some dumb SEDs
-       dnl cannot handle comments.
-       sed -e '/^#/d' $srcdir/$msgformat-msg.sed > po2msg.sed
-      fi
-      dnl po2tbl.sed is always needed.
-      sed -e '/^#.*[^\\]$/d' -e '/^#$/d' \
-        $srcdir/po2tbl.sed.in > po2tbl.sed
+     dnl Transform the SED scripts while copying because some dumb SEDs
+     dnl cannot handle comments.
+     sed -e '/^#/d' $srcdir/intl/$msgformat-msg.sed > intl/po2msg.sed
    fi
+   dnl po2tbl.sed is always needed.
+   sed -e '/^#.*[^\\]$/d' -e '/^#$/d' \
+     $srcdir/intl/po2tbl.sed.in > intl/po2tbl.sed
 
    dnl In the intl/Makefile.in we have a special dependency which makes
    dnl only sense for gettext.  We comment this out for non-gettext