[beast] BUILD: fixed EXTRA_DIST for recently added scripts

[Tim Janik <timj src gnome org>]

commit 0f14efbade854d9b951bd9918e167330545e35ab
Author: Tim Janik <timj gtk org>
Date:   Tue Sep 7 02:14:51 2010 +0200

    BUILD: fixed EXTRA_DIST for recently added scripts

 configure.in   |    5 +++--
 po/Makefile.am |   19 +++++++++++--------
 2 files changed, 14 insertions(+), 10 deletions(-)
---
diff --git a/configure.in b/configure.in
index 5ec6ad7..83d039a 100644
--- a/configure.in
+++ b/configure.in
@@ -203,7 +203,8 @@ AC_DEFUN([AC_I18N_REQUIREMENTS],
   AC_PATH_PROG(MSGFMT, msgfmt, msgfmt)
   AC_PATH_PROG(MSGMERGE, msgmerge, msgmerge)
   AC_PATH_PROG(XGETTEXT, xgettext, xgettext)
-  INTLMERGE='$(abs_top_srcdir)/autotools/intltool-merge'
+  AC_SUBST(ac_aux_dir) dnl # needed to ship various intlfix scripts
+  INTLMERGE='$(top_builddir)/$(ac_aux_dir)/intltool-merge'
   AC_SUBST(INTLMERGE) dnl # AC_PATH_PROG(INTLMERGE, intltool-merge, intltool-merge)
 ])
 AC_DEFUN([AC_SFI_REQUIREMENTS],
@@ -219,7 +220,7 @@ AC_DEFUN([AC_SFI_REQUIREMENTS],
 
     AC_CHECK_FUNCS(getpwnam_r getpwnam)
     AC_CHECK_FUNCS(timegm)
-    
+
     dnl # --- toy profiler ---
     AM_CONDITIONAL(IF_TOYPROF, test x"$enable_toyprof" = xyes)
 
diff --git a/po/Makefile.am b/po/Makefile.am
index d6629d3..13e2ee3 100644
--- a/po/Makefile.am
+++ b/po/Makefile.am
@@ -24,19 +24,19 @@ POSRC_TYPES =
 #
 POSRC_TYPES          += XML
 POSRC_XML_PATTERN     = '\.xml\(.in\)\?$$'
-POSRC_XML_FILTER      = gawk -f ./autotools/intlfix-xml.awk
+POSRC_XML_FILTER      = gawk -f $(INTLFIXDIR)/intlfix-xml.awk
 #
 POSRC_TYPES          += SCM
 POSRC_SCM_PATTERN     = '\.scm\(.in\)\?$$'
-POSRC_SCM_FILTER      = sed -f ./autotools/intlfix-scm.sed
+POSRC_SCM_FILTER      = sed -f $(INTLFIXDIR)/intlfix-scm.sed
 #
 POSRC_TYPES          += KEYS
 POSRC_KEYS_PATTERN    = '\.keys\(.in\)\?$$'
-POSRC_KEYS_FILTER     = gawk -f ./autotools/intlfix-las.awk
+POSRC_KEYS_FILTER     = gawk -f $(INTLFIXDIR)/intlfix-las.awk
 #
 POSRC_TYPES          += DESKTOP
 POSRC_DESKTOP_PATTERN = '\.desktop\(.in\)\?$$'
-POSRC_DESKTOP_FILTER  = gawk -f ./autotools/intlfix-las.awk
+POSRC_DESKTOP_FILTER  = gawk -f $(INTLFIXDIR)/intlfix-las.awk
 #
 POSRC_TYPES          += IDL
 POSRC_IDL_PATTERN     = '\.idl\(.in\)\?$$'
@@ -57,7 +57,10 @@ POSRC_CCH_FILTER      =
 TRANSLATIONS = $(if ${PO_LINGUAS}, ${PO_LINGUAS}, ${ALL_LINGUAS})
 GMOFILES     = $(patsubst %, %.gmo, $(TRANSLATIONS))
 POFILES      = $(patsubst %, %.po,  $(TRANSLATIONS))
-EXTRA_DIST  += $(POFILES) messages.pot
+INTLFIXDIR   = $(top_builddir)/$(ac_aux_dir)
+EXTRA_DIST  += POTIGNORE POTSCAN POTSKIP $(POFILES) messages.pot
+EXTRA_DIST  += $(INTLFIXDIR)/intltool-merge  $(INTLFIXDIR)/intlfix-scm.sed
+EXTRA_DIST  += $(INTLFIXDIR)/intlfix-xml.awk $(INTLFIXDIR)/intlfix-las.awk
 CLEANFILES  += $(GMOFILES)
 KEYWORDS     = _ N_ U_ Q_
 TEXTFLAGS    = _:1:pass-c-format
@@ -152,7 +155,7 @@ define prepare_pot_source
 	  cat "potlist$$$$.tmp" | \
 	  while read file ; do \
 	    d=`dirname "$$file"` ; mkdir -p "$(TMPDIR)/$$d" || exit $$? ; \
-	    (cd $(top_srcdir) && $(POSRC_$(strip $(1))_FILTER) "$$file") > "$(TMPDIR)/$$file" \
+	    $(POSRC_$(strip $(1))_FILTER) $(top_srcdir)/"$$file" > "$(TMPDIR)/$$file" \
 	    || exit $$? ; \
 	  done \
 	, \
@@ -169,7 +172,7 @@ unlisted:
 	| if test -e POTSCAN   ; then grep -vFf POTSCAN   ; else cat ; fi \
 	| if test -e POTSKIP   ; then grep -vFf POTSKIP   ; else cat ; fi \
 	| if test -e POTIGNORE ; then grep -vEf POTIGNORE ; else cat ; fi \
-	> "xgen-$(@F)"
+	> "xgen-$(@F)" ; :
 	@ # scanning file types...
 	@$(foreach TYPE, $(POSRC_TYPES), \
 	  $(call test_unlisted, $(TYPE), "xgen-$(@F)", "unlisted"))
@@ -186,7 +189,7 @@ define test_unlisted
 	grep $(POSRC_$(strip $(1))_PATTERN) $(2) | \
 	  $(if $(POSRC_$(strip $(1))_FILTER), \
 	    while read file ; do \
-	      (cd $(top_srcdir) && INTLFIX=:marker: $(POSRC_$(strip $(1))_FILTER) "$$file") | \
+	      INTLFIX=:marker: $(POSRC_$(strip $(1))_FILTER $(top_srcdir)/"$$file") | \
 	      grep -q $(INLTFIXPATTERN) && echo "$$file" ; \
 	    done \
 	  , \