2005-03-23  Stepan Kasal  <kasal@ucw.cz>

	* Makefile.in.in: Fix the rule for POTFILES so that it deletes the
	  [encoding:...] tags.  Don't use \[ as it's non-POSIX extension.
	  Other minor simplifications.
	* intltool.m4: In the code which creates POTFILES, don't use \[,
	  and use correct quoting, instead of changequote().

Index: Makefile.in.in
===================================================================
RCS file: /cvs/gnome/intltool/Makefile.in.in,v
retrieving revision 1.6
diff -u -r1.6 Makefile.in.in
--- Makefile.in.in	1 Mar 2005 19:54:34 -0000	1.6
+++ Makefile.in.in	23 Mar 2005 10:20:57 -0000
@@ -238,17 +238,13 @@
 # and Intltool tags (enclosed in square brackets), and appending a full
 # relative path to them
 POTFILES: POTFILES.in
-	( if test 'x$(srcdir)' != 'x.'; then \
-	    posrcprefix='$(top_srcdir)/'; \
-	  else \
-	    posrcprefix="../"; \
-	  fi; \
+	( posrcprefix='$(top_srcdir)/'; \
 	  rm -f $@-t $@ \
-	    && (sed -e '/^#/d' 						\
-		    -e "s/^\[.*\] +//" 					\
-		    -e '/^[ 	]*$$/d' 				\
-		    -e "s@.*@	$$posrcprefix& \\\\@" < $(srcdir)/$@.in	\
-		| sed -e '$$s/\\$$//') > $@-t \
+	    && (sed -e '/^#/d' 					\
+		    -e 's/^[[].*] *//' 				\
+		    -e '/^[ 	]*$$/d' 			\
+		    -e "s@^@	$$posrcprefix@" $(srcdir)/$@.in	\
+		| sed -e '$$!s/$$/ \\/') > $@-t \
 	    && chmod a-w $@-t \
 	    && mv $@-t $@ )
 
Index: intltool.m4
===================================================================
RCS file: /cvs/gnome/intltool/intltool.m4,v
retrieving revision 1.82
diff -u -r1.82 intltool.m4
--- intltool.m4	25 Nov 2004 15:01:32 -0000	1.82
+++ intltool.m4	23 Mar 2005 10:20:57 -0000
@@ -115,20 +115,18 @@
 
 ifdef([AC_DIVERSION_ICMDS],[
   AC_DIVERT_PUSH(AC_DIVERSION_ICMDS)
-      changequote(,)
-      mv -f po/POTFILES po/POTFILES.tmp
-      sed -e '/\[encoding.*\]/d' -e 's/\[.*\] *//' < po/POTFILES.tmp > po/POTFILES
+     [mv -f po/POTFILES po/POTFILES.tmp
+      sed -e '/[[]encoding.*]/d' -e 's/[[].*] *//' < po/POTFILES.tmp > po/POTFILES
       rm -f po/POTFILES.tmp
-      changequote([,])
+     ]dnl
   AC_DIVERT_POP()
 ],[
   ifdef([AC_CONFIG_COMMANDS_PRE],[
     AC_CONFIG_COMMANDS_PRE([
-        changequote(,)
-        mv -f po/POTFILES po/POTFILES.tmp
-        sed -e '/\[encoding.*\]/d' -e 's/\[.*\] *//' < po/POTFILES.tmp > po/POTFILES
+       [mv -f po/POTFILES po/POTFILES.tmp
+        sed -e '/[[]encoding.*]/d' -e 's/[[].*] *//' < po/POTFILES.tmp > po/POTFILES
         rm -f po/POTFILES.tmp
-        changequote([,])
+       ]dnl
     ])
   ])
 
