Even more voodoo for distcheck.

ChangeLog

@@ -24,6 +24,10 @@
 	* app/widgets/gimppaletteeditor.h: forgot to declare the _get_type()
 	functions publically.
 
+2002-03-08  Sven Neumann  <sven@gimp.org>
+
+	* configure.in: reorder AC_OUTPUT to make intltool happy.
+	
 2002-03-08  Sven Neumann  <sven@gimp.org>
 
 	Handle gtk-doc just like GTK+ does it now:

configure.in

@@ -120,7 +120,7 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE")
 
 ALL_LINGUAS="ca cs da de el en_GB es fi fr ga gl hu hr it ja ko nl no pl pt_BR ro ru sk sv tr uk zh_CN zh_TW"
 
-AC_PROG_INTLTOOL
+AC_PROG_INTLTOOL(0.17)
 AM_GLIB_GNU_GETTEXT
 
 
@@ -865,11 +865,6 @@ dnl plug-ins/gdyntext/Makefile
 dnl plug-ins/helpbrowser/Makefile
 dnl plug-ins/perl/po/Makefile.in
 AC_OUTPUT([
-gimptool-1.3
-gimp-1.3.pc
-gimpui-1.3.pc
-gimp.spec
-Makefile
 build/Makefile
 build/win32/Makefile
 build/win32/dirent/Makefile
@@ -982,6 +977,11 @@ po/Makefile.in
 po-libgimp/Makefile.in
 po-plug-ins/Makefile.in
 po-script-fu/Makefile.in
+gimptool-1.3
+gimp-1.3.pc
+gimpui-1.3.pc
+gimp.spec
+Makefile
 ],[
    chmod +x gimptool-1.3
 

tips/ChangeLog

+2002-03-08  Sven Neumann  <sven@gimp.org>
+
+	* Makefile.am: more voodoo.
+
 2002-03-08  Wang Jian  <lark@linux.net.cn>
 
 	* zh_CN.po: Updated Simplified Chinese translation by

tips/Makefile.am

@@ -6,12 +6,33 @@ tips_in_files = gimp-tips.xml.in
 
 tipsdata_DATA = $(tips_in_files:.xml.in=.xml)
 
-%.xml: %.xml.in $(GETTEXT_PACKAGE)-tips.pot $(wildcard $(srcdir)/*.po)
+%.xml: %.xml.in $(srcdir)/$(GETTEXT_PACKAGE)-tips.pot  $(wildcard $(srcdir)/*.po)
 	$(INTLTOOL_MERGE) $(srcdir) $< $(@) -x -u -c .intltool-merge-cache
 
-$(GETTEXT_PACKAGE)-tips.pot: $(srcdir)/gimp-tips.xml.in
-	$(INTLTOOL_EXTRACT) --type=gettext/xml $<
-	$(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE)-tips --pot
+GENPOT = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE)-tips --pot
+
+# POTFILES is created from POTFILES.in by stripping comments, empty lines
+# 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; \
+	  rm -f $@-t $@ \
+	    && (sed -e '/^#/d' 						\
+		    -e "s/^\[.*\] +//" 					\
+		    -e '/^[ 	]*$$/d' 				\
+		    -e "s@.*@	$$posrcprefix& \\\\@" < $(srcdir)/$@.in	\
+		| sed -e '$$s/\\$$//') > $@-t \
+	    && chmod a-w $@-t \
+	    && mv $@-t $@ )
+
+$(srcdir)/$(GETTEXT_PACKAGE)-tips.pot: $(POTFILES)
+	$(GENPOT)
+
+CLEANFILES = $(GETTEXT_PACKAGE)-tips.po
 
 oldtips = \
 	gimp_tips.cs.txt	\