2005-01-27 Rodney Dawes <dobey@novell.com>

	* Makefile.in.in: Update comment header block to include notification
	of modifications for intltool, and for the "INTLTOOL_MAKEFILE" string

	* intltoolize.in: Remove all of the patching and replace it with a
	check for the "INTLTOOL_MAKEFILE" string in Makefile.in.in, and an
	error message for when that fails

	Fixes #165066

1 files changed, 3 insertions, 29 deletions

diff --git a/intltoolize.in b/intltoolize.in
index 872ad28..4286912 100644
--- a/intltoolize.in
+++ b/intltoolize.in
@@ -269,35 +269,9 @@ fi
 # FIXME: This probably does not work w/ builddir != srcdir because it
 # gets at source files relative to the current directory.
 
-if grep GENPOT po/Makefile.in.in >/dev/null; then
-  echo "no need for patching file 'Makefile.in.in'";
-
-# gettextize 4.x Standard 
-elif grep '# Copyright (C) 1995-1997, 2000-2002' po/Makefile.in.in > /dev/null; then
-  patch po/Makefile.in.in < $pkgdatadir/intltool-po-Makefile.in.in-patch-5
-# gettext 0.12 and 0.13
-elif grep '# Copyright (C) 1995-1997, 2000-2003' po/Makefile.in.in > /dev/null;
-then
-  patch po/Makefile.in.in < $pkgdatadir/intltool-po-Makefile.in.in-patch-8
-
-# glib-gettextize
-elif grep '# POTFILES is created from POTFILES.in' po/Makefile.in.in > /dev/null; then
-  if grep 'lang.new.po' po/Makefile.in.in > /dev/null; then
-    patch po/Makefile.in.in < $pkgdatadir/intltool-po-Makefile.in.in-patch-7
-  elif grep 'XGETTEXT = @XGETTEXT@' po/Makefile.in.in > /dev/null; then 
-    patch po/Makefile.in.in < $pkgdatadir/intltool-po-Makefile.in.in-patch-6
-  else
-    patch po/Makefile.in.in < $pkgdatadir/intltool-po-Makefile.in.in-patch-4
-  fi
-
-elif grep GETTEXT_PACKAGE po/Makefile.in.in >/dev/null; then
-  patch po/Makefile.in.in < $pkgdatadir/intltool-po-Makefile.in.in-patch-3
-
-elif grep builddir po/Makefile.in.in >/dev/null; then
-  patch po/Makefile.in.in < $pkgdatadir/intltool-po-Makefile.in.in-patch-2
-
-else
-  patch po/Makefile.in.in < $pkgdatadir/intltool-po-Makefile.in.in-patch-1
+if ! grep INTLTOOL_MAKEFILE po/Makefile.in.in >/dev/null; then
+  echo "$progname: 'po/Makefile.in.in' is out of date: use '--force' to overwrite"
+  exit 1
 fi
 
 exit $status