Make 'make distcheck' work in a VPATH build.

* Makefile.am (distcheck-hook): Compare files in $(srcdir).
* gettext-tools/examples/po/xsmallpot.sh: Put the resulting POT file in the
source dir, not in the build dir.
* gettext-tools/examples/po/Makefile.am (update-po): Execute sub-make in the
build dir, not in the source dir.
(SMALLPOFILES_FOR_lang): Prefix file names with $(srcdir).
(hello-*/po/*.po): Likewise. Execute mmsmallpo.sh in $(srcdir).

diff --git a/Makefile.am b/Makefile.am
index 8f5d8ceb1d253e4e42c6134e0617df2a0f072230..9130c327ed08eafe2ba97fde80e5a716646fe3da 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -61,75 +61,73 @@ $(srcdir)/configure: $(srcdir)/gettext-runtime/configure.ac $(srcdir)/gettext-to
 
 # Verify that some files are the same.
 distcheck-hook:
-       cmp -s gettext-runtime/po/Makefile.in.in gettext-tools/po/Makefile.in.in
-       cmp -s gettext-runtime/po/Rules-quot gettext-tools/po/Rules-quot
-       cmp -s gettext-runtime/po/boldquot.sed gettext-tools/po/boldquot.sed
-       cmp -s gettext-runtime/po/quot.sed gettext-tools/po/quot.sed
-       cmp -s gettext-runtime/po/en@quot.header gettext-tools/po/en@quot.header
-       cmp -s gettext-runtime/po/en@boldquot.header gettext-tools/po/en@boldquot.header
-       cmp -s gettext-runtime/po/insert-header.sin gettext-tools/po/insert-header.sin
-       cmp -s gettext-runtime/po/remove-potcdate.sin gettext-tools/po/remove-potcdate.sin
-       cmp -s gettext-runtime/po/remove-potcdate.sin gettext-tools/examples/po/remove-potcdate.sin
-       cmp -s gettext-runtime/m4/codeset.m4 gettext-tools/gnulib-m4/codeset.m4
-       cmp -s gettext-runtime/m4/extern-inline.m4 gettext-tools/gnulib-m4/extern-inline.m4
-       cmp -s gettext-runtime/m4/fcntl-o.m4 gettext-tools/gnulib-m4/fcntl-o.m4
-       cmp -s gettext-runtime/m4/flexmember.m4 gettext-tools/gnulib-m4/flexmember.m4
-       cmp -s gettext-runtime/m4/gettext.m4 gettext-tools/gnulib-m4/gettext.m4
-       cmp -s gettext-runtime/m4/glibc2.m4 gettext-tools/gnulib-m4/glibc2.m4
-       cmp -s gettext-runtime/m4/glibc21.m4 gettext-tools/gnulib-m4/glibc21.m4
-       cmp -s gettext-runtime/m4/iconv.m4 gettext-tools/gnulib-m4/iconv.m4
-       cmp -s gettext-runtime/m4/intdiv0.m4 gettext-tools/gnulib-m4/intdiv0.m4
-       cmp -s gettext-runtime/m4/intl.m4 gettext-tools/gnulib-m4/intl.m4
-       cmp -s gettext-runtime/m4/intl-thread-locale.m4 gettext-tools/gnulib-m4/intl-thread-locale.m4
-       cmp -s gettext-runtime/m4/intldir.m4 gettext-tools/gnulib-m4/intldir.m4
-       cmp -s gettext-runtime/m4/intlmacosx.m4 gettext-tools/gnulib-m4/intlmacosx.m4
-       cmp -s gettext-runtime/m4/intmax.m4 gettext-tools/gnulib-m4/intmax.m4
-       cmp -s gettext-runtime/m4/inttypes-pri.m4 gettext-tools/gnulib-m4/inttypes-pri.m4
-       cmp -s gettext-runtime/m4/inttypes_h.m4 gettext-tools/gnulib-m4/inttypes_h.m4
-       cmp -s gettext-runtime/m4/lcmessage.m4 gettext-tools/gnulib-m4/lcmessage.m4
-       cmp -s gettext-runtime/m4/lock.m4 gettext-tools/gnulib-m4/lock.m4
-       cmp -s gettext-runtime/m4/longlong.m4 gettext-tools/gnulib-m4/longlong.m4
-       cmp -s gettext-runtime/m4/nls.m4 gettext-tools/gnulib-m4/nls.m4
-       cmp -s gettext-runtime/m4/po.m4 gettext-tools/gnulib-m4/po.m4
-       cmp -s gettext-runtime/m4/gettext.m4 gettext-tools/gnulib-m4/gettext.m4
-       cmp -s gettext-runtime/m4/printf-posix.m4 gettext-tools/gnulib-m4/printf-posix.m4
-       cmp -s gettext-runtime/m4/progtest.m4 gettext-tools/gnulib-m4/progtest.m4
-       cmp -s gettext-runtime/m4/size_max.m4 gettext-tools/gnulib-m4/size_max.m4
-       cmp -s gettext-runtime/m4/stdint_h.m4 gettext-tools/gnulib-m4/stdint_h.m4
-       cmp -s gettext-runtime/m4/threadlib.m4 gettext-tools/gnulib-m4/threadlib.m4
-       cmp -s gettext-runtime/m4/uintmax_t.m4 gettext-tools/gnulib-m4/uintmax_t.m4
-       cmp -s gettext-runtime/m4/visibility.m4 gettext-tools/gnulib-m4/visibility.m4
-       cmp -s gettext-runtime/m4/wchar_t.m4 gettext-tools/gnulib-m4/wchar_t.m4
-       cmp -s gettext-runtime/m4/wint_t.m4 gettext-tools/gnulib-m4/wint_t.m4
-       cmp -s gettext-runtime/m4/xsize.m4 gettext-tools/gnulib-m4/xsize.m4
-       cmp -s gettext-runtime/libasprintf/gnulib-m4/intmax_t.m4 gettext-tools/gnulib-m4/intmax_t.m4
-       test "`sed 1,16d gettext-runtime/intl/flexmember.h | md5sum`" = "`sed 1,19d gettext-tools/gnulib-lib/flexmember.h | md5sum`"
-       test "`sed 1,16d gettext-runtime/intl/localcharset.h | md5sum`" = "`sed 1,16d gettext-tools/gnulib-lib/localcharset.h | md5sum`"
-       test "`sed 1,16d gettext-runtime/intl/localcharset.c | md5sum`" = "`sed 1,16d gettext-tools/gnulib-lib/localcharset.c | md5sum`"
-       test "`sed 1,16d gettext-runtime/intl/localename.c | md5sum`" = "`sed 1,16d gettext-tools/gnulib-lib/localename.c | md5sum`"
-       test "`sed 1,16d gettext-runtime/intl/localename-table.in.h | md5sum`" = "`sed 1,16d gettext-tools/gnulib-lib/localename-table.h | md5sum`"
-       test "`sed 1,16d gettext-runtime/intl/localename-table.c | md5sum`" = "`sed 1,16d gettext-tools/gnulib-lib/localename-table.c | md5sum`"
-       test "`sed 1,15d gettext-runtime/intl/lock.h | md5sum`" = "`sed 1,15d gettext-tools/gnulib-lib/glthread/lock.h | md5sum`"
-       test "`sed 1,15d gettext-runtime/intl/lock.c | md5sum`" = "`sed -e 1,15d -e 's,glthread/,,g' gettext-tools/gnulib-lib/glthread/lock.c | md5sum`"
-       test "`sed 1,16d gettext-runtime/intl/verify.h | md5sum`" = "`sed 1,16d gettext-tools/gnulib-lib/verify.h | md5sum`"
-       cmp -s gettext-runtime/intl/printf-args.h gettext-runtime/libasprintf/printf-args.h
-       cmp -s gettext-runtime/intl/printf-args.c gettext-runtime/libasprintf/printf-args.c
-       cmp -s gettext-runtime/intl/printf-parse.h gettext-runtime/libasprintf/printf-parse.h
-       cmp -s gettext-runtime/intl/printf-parse.c gettext-runtime/libasprintf/printf-parse.c
-       cmp -s gettext-runtime/intl/verify.h gettext-runtime/libasprintf/verify.h
-       test "`sed 1,18d gettext-runtime/intl/relocatable.h | md5sum`" = "`sed 1,18d gettext-tools/gnulib-lib/relocatable.h | md5sum`"
-       test "`sed 1,18d gettext-runtime/intl/relocatable.c | md5sum`" = "`sed 1,18d gettext-tools/gnulib-lib/relocatable.c | md5sum`"
-       cmp -s gettext-runtime/intl/vasnprintf.h gettext-runtime/libasprintf/vasnprintf.h
-       test "`sed 1,16d gettext-runtime/intl/vasnprintf.c | md5sum`" = "`sed 1,16d gettext-tools/gnulib-lib/vasnprintf.c | md5sum`"
-       cmp -s gettext-runtime/intl/vasnprintf.c gettext-runtime/libasprintf/vasnprintf.c
-       cmp -s gettext-runtime/intl/xsize.h gettext-runtime/libasprintf/xsize.h
-       test "`sed 1,16d gettext-runtime/intl/xsize.h | md5sum`" = "`sed 1,16d gettext-tools/gnulib-lib/xsize.h | md5sum`"
-       cmp -s gettext-runtime/man/help2man gettext-tools/man/help2man
-       cmp -s gettext-runtime/man/x-to-1.in gettext-tools/man/x-to-1.in
-       cmp -s gettext-runtime/libasprintf/texi2html gettext-tools/doc/texi2html
-       cmp -s gettext-tools/examples/hello-java-awt/m4/TestAWT.java gettext-tools/examples/hello-java-swing/m4/TestAWT.java
-       cmp -s gettext-tools/examples/hello-java-awt/m4/TestAWT.class gettext-tools/examples/hello-java-swing/m4/TestAWT.class
-       test "`sed 1,15d gnulib-local/lib/alloca.in.h | md5sum`" = "`sed 1,15d gettext-runtime/libasprintf/alloca.in.h | md5sum`"
+       cmp -s $(srcdir)/gettext-runtime/po/Makefile.in.in $(srcdir)/gettext-tools/po/Makefile.in.in
+       cmp -s $(srcdir)/gettext-runtime/po/Rules-quot $(srcdir)/gettext-tools/po/Rules-quot
+       cmp -s $(srcdir)/gettext-runtime/po/boldquot.sed $(srcdir)/gettext-tools/po/boldquot.sed
+       cmp -s $(srcdir)/gettext-runtime/po/quot.sed $(srcdir)/gettext-tools/po/quot.sed
+       cmp -s $(srcdir)/gettext-runtime/po/en@quot.header $(srcdir)/gettext-tools/po/en@quot.header
+       cmp -s $(srcdir)/gettext-runtime/po/en@boldquot.header $(srcdir)/gettext-tools/po/en@boldquot.header
+       cmp -s $(srcdir)/gettext-runtime/po/insert-header.sin $(srcdir)/gettext-tools/po/insert-header.sin
+       cmp -s $(srcdir)/gettext-runtime/po/remove-potcdate.sin $(srcdir)/gettext-tools/po/remove-potcdate.sin
+       cmp -s $(srcdir)/gettext-runtime/po/remove-potcdate.sin $(srcdir)/gettext-tools/examples/po/remove-potcdate.sin
+       cmp -s $(srcdir)/gettext-runtime/m4/codeset.m4 $(srcdir)/gettext-tools/gnulib-m4/codeset.m4
+       cmp -s $(srcdir)/gettext-runtime/m4/extern-inline.m4 $(srcdir)/gettext-tools/gnulib-m4/extern-inline.m4
+       cmp -s $(srcdir)/gettext-runtime/m4/fcntl-o.m4 $(srcdir)/gettext-tools/gnulib-m4/fcntl-o.m4
+       cmp -s $(srcdir)/gettext-runtime/m4/flexmember.m4 $(srcdir)/gettext-tools/gnulib-m4/flexmember.m4
+       cmp -s $(srcdir)/gettext-runtime/m4/gettext.m4 $(srcdir)/gettext-tools/gnulib-m4/gettext.m4
+       cmp -s $(srcdir)/gettext-runtime/m4/glibc2.m4 $(srcdir)/gettext-tools/gnulib-m4/glibc2.m4
+       cmp -s $(srcdir)/gettext-runtime/m4/glibc21.m4 $(srcdir)/gettext-tools/gnulib-m4/glibc21.m4
+       cmp -s $(srcdir)/gettext-runtime/m4/iconv.m4 $(srcdir)/gettext-tools/gnulib-m4/iconv.m4
+       cmp -s $(srcdir)/gettext-runtime/m4/intdiv0.m4 $(srcdir)/gettext-tools/gnulib-m4/intdiv0.m4
+       cmp -s $(srcdir)/gettext-runtime/m4/intl.m4 $(srcdir)/gettext-tools/gnulib-m4/intl.m4
+       cmp -s $(srcdir)/gettext-runtime/m4/intl-thread-locale.m4 $(srcdir)/gettext-tools/gnulib-m4/intl-thread-locale.m4
+       cmp -s $(srcdir)/gettext-runtime/m4/intlmacosx.m4 $(srcdir)/gettext-tools/gnulib-m4/intlmacosx.m4
+       cmp -s $(srcdir)/gettext-runtime/m4/intmax.m4 $(srcdir)/gettext-tools/gnulib-m4/intmax.m4
+       cmp -s $(srcdir)/gettext-runtime/m4/inttypes-pri.m4 $(srcdir)/gettext-tools/gnulib-m4/inttypes-pri.m4
+       cmp -s $(srcdir)/gettext-runtime/m4/inttypes_h.m4 $(srcdir)/gettext-tools/gnulib-m4/inttypes_h.m4
+       cmp -s $(srcdir)/gettext-runtime/m4/lcmessage.m4 $(srcdir)/gettext-tools/gnulib-m4/lcmessage.m4
+       cmp -s $(srcdir)/gettext-runtime/m4/lock.m4 $(srcdir)/gettext-tools/gnulib-m4/lock.m4
+       cmp -s $(srcdir)/gettext-runtime/m4/longlong.m4 $(srcdir)/gettext-tools/gnulib-m4/longlong.m4
+       cmp -s $(srcdir)/gettext-runtime/m4/nls.m4 $(srcdir)/gettext-tools/gnulib-m4/nls.m4
+       cmp -s $(srcdir)/gettext-runtime/m4/po.m4 $(srcdir)/gettext-tools/gnulib-m4/po.m4
+       cmp -s $(srcdir)/gettext-runtime/m4/printf-posix.m4 $(srcdir)/gettext-tools/gnulib-m4/printf-posix.m4
+       cmp -s $(srcdir)/gettext-runtime/m4/progtest.m4 $(srcdir)/gettext-tools/gnulib-m4/progtest.m4
+       cmp -s $(srcdir)/gettext-runtime/m4/size_max.m4 $(srcdir)/gettext-tools/gnulib-m4/size_max.m4
+       cmp -s $(srcdir)/gettext-runtime/m4/stdint_h.m4 $(srcdir)/gettext-tools/gnulib-m4/stdint_h.m4
+       cmp -s $(srcdir)/gettext-runtime/m4/threadlib.m4 $(srcdir)/gettext-tools/gnulib-m4/threadlib.m4
+       cmp -s $(srcdir)/gettext-runtime/m4/uintmax_t.m4 $(srcdir)/gettext-tools/gnulib-m4/uintmax_t.m4
+       cmp -s $(srcdir)/gettext-runtime/m4/visibility.m4 $(srcdir)/gettext-tools/gnulib-m4/visibility.m4
+       cmp -s $(srcdir)/gettext-runtime/m4/wchar_t.m4 $(srcdir)/gettext-tools/gnulib-m4/wchar_t.m4
+       cmp -s $(srcdir)/gettext-runtime/m4/wint_t.m4 $(srcdir)/gettext-tools/gnulib-m4/wint_t.m4
+       cmp -s $(srcdir)/gettext-runtime/m4/xsize.m4 $(srcdir)/gettext-tools/gnulib-m4/xsize.m4
+       cmp -s $(srcdir)/gettext-runtime/libasprintf/gnulib-m4/intmax_t.m4 $(srcdir)/gettext-tools/gnulib-m4/intmax_t.m4
+       test "`sed 1,16d $(srcdir)/gettext-runtime/intl/flexmember.h | md5sum`" = "`sed 1,19d $(srcdir)/gettext-tools/gnulib-lib/flexmember.h | md5sum`"
+       test "`sed 1,16d $(srcdir)/gettext-runtime/intl/localcharset.h | md5sum`" = "`sed 1,16d $(srcdir)/gettext-tools/gnulib-lib/localcharset.h | md5sum`"
+       test "`sed 1,16d $(srcdir)/gettext-runtime/intl/localcharset.c | md5sum`" = "`sed 1,16d $(srcdir)/gettext-tools/gnulib-lib/localcharset.c | md5sum`"
+       test "`sed 1,16d $(srcdir)/gettext-runtime/intl/localename.c | md5sum`" = "`sed 1,16d $(srcdir)/gettext-tools/gnulib-lib/localename.c | md5sum`"
+       test "`sed 1,16d $(srcdir)/gettext-runtime/intl/localename-table.in.h | md5sum`" = "`sed 1,16d $(srcdir)/gettext-tools/gnulib-lib/localename-table.h | md5sum`"
+       test "`sed 1,16d $(srcdir)/gettext-runtime/intl/localename-table.c | md5sum`" = "`sed 1,16d $(srcdir)/gettext-tools/gnulib-lib/localename-table.c | md5sum`"
+       test "`sed 1,15d $(srcdir)/gettext-runtime/intl/lock.h | md5sum`" = "`sed 1,15d $(srcdir)/gettext-tools/gnulib-lib/glthread/lock.h | md5sum`"
+       test "`sed 1,15d $(srcdir)/gettext-runtime/intl/lock.c | md5sum`" = "`sed -e 1,15d -e 's,glthread/,,g' $(srcdir)/gettext-tools/gnulib-lib/glthread/lock.c | md5sum`"
+       test "`sed 1,16d $(srcdir)/gettext-runtime/intl/verify.h | md5sum`" = "`sed 1,16d $(srcdir)/gettext-tools/gnulib-lib/verify.h | md5sum`"
+       cmp -s $(srcdir)/gettext-runtime/intl/printf-args.h $(srcdir)/gettext-runtime/libasprintf/printf-args.h
+       cmp -s $(srcdir)/gettext-runtime/intl/printf-args.c $(srcdir)/gettext-runtime/libasprintf/printf-args.c
+       cmp -s $(srcdir)/gettext-runtime/intl/printf-parse.h $(srcdir)/gettext-runtime/libasprintf/printf-parse.h
+       cmp -s $(srcdir)/gettext-runtime/intl/printf-parse.c $(srcdir)/gettext-runtime/libasprintf/printf-parse.c
+       cmp -s $(srcdir)/gettext-runtime/intl/verify.h $(srcdir)/gettext-runtime/libasprintf/verify.h
+       test "`sed 1,18d $(srcdir)/gettext-runtime/intl/relocatable.h | md5sum`" = "`sed 1,18d $(srcdir)/gettext-tools/gnulib-lib/relocatable.h | md5sum`"
+       test "`sed 1,18d $(srcdir)/gettext-runtime/intl/relocatable.c | md5sum`" = "`sed 1,18d $(srcdir)/gettext-tools/gnulib-lib/relocatable.c | md5sum`"
+       cmp -s $(srcdir)/gettext-runtime/intl/vasnprintf.h $(srcdir)/gettext-runtime/libasprintf/vasnprintf.h
+       test "`sed 1,16d $(srcdir)/gettext-runtime/intl/vasnprintf.c | md5sum`" = "`sed 1,16d $(srcdir)/gettext-tools/gnulib-lib/vasnprintf.c | md5sum`"
+       cmp -s $(srcdir)/gettext-runtime/intl/vasnprintf.c $(srcdir)/gettext-runtime/libasprintf/vasnprintf.c
+       cmp -s $(srcdir)/gettext-runtime/intl/xsize.h $(srcdir)/gettext-runtime/libasprintf/xsize.h
+       test "`sed 1,16d $(srcdir)/gettext-runtime/intl/xsize.h | md5sum`" = "`sed 1,16d $(srcdir)/gettext-tools/gnulib-lib/xsize.h | md5sum`"
+       cmp -s $(srcdir)/gettext-runtime/man/help2man $(srcdir)/gettext-tools/man/help2man
+       cmp -s $(srcdir)/gettext-runtime/man/x-to-1.in $(srcdir)/gettext-tools/man/x-to-1.in
+       cmp -s $(srcdir)/gettext-runtime/libasprintf/texi2html $(srcdir)/gettext-tools/doc/texi2html
+       cmp -s $(srcdir)/gettext-tools/examples/hello-java-awt/m4/TestAWT.java $(srcdir)/gettext-tools/examples/hello-java-swing/m4/TestAWT.java
+       cmp -s $(srcdir)/gettext-tools/examples/hello-java-awt/m4/TestAWT.class $(srcdir)/gettext-tools/examples/hello-java-swing/m4/TestAWT.class
+       test "`sed 1,15d $(srcdir)/gnulib-local/lib/alloca.in.h | md5sum`" = "`sed 1,15d $(srcdir)/gettext-runtime/libasprintf/alloca.in.h | md5sum`"
 
 
 # OS/2 port.

diff --git a/gettext-tools/examples/po/Makefile.am b/gettext-tools/examples/po/Makefile.am
index 5892280fe2cc632375209105b238d8290c6536b5..b4e32d6015d416aaf80d8863aa73f7c8f6a14e37 100644 (file)
--- a/gettext-tools/examples/po/Makefile.am
+++ b/gettext-tools/examples/po/Makefile.am
@@ -368,23 +368,24 @@ update-po: Makefile
        echo "$$lang:"; \
        test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
        echo "$${cdcmd}$(MSGMERGE) $(MSGMERGE_OPTIONS) $$lang.po $(DOMAIN).pot -o $$lang.new.po"; \
-       cd $(srcdir); \
-       if $(MSGMERGE) $(MSGMERGE_OPTIONS) $$lang.po $(DOMAIN).pot -o $$tmpdir/$$lang.new.po; then \
-         if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
-           rm -f $$tmpdir/$$lang.new.po; \
-         else \
-           if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \
-             :; \
-           else \
-             echo "msgmerge for $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \
-             exit 1; \
-           fi; \
-         fi; \
-         $(MAKE) $(SMALLPOFILES_FOR_lang) LL=$$lang; \
-       else \
-         echo "msgmerge for $$lang.po failed!" 1>&2; \
-         rm -f $$tmpdir/$$lang.new.po; \
-       fi
+       (cd $(srcdir) && \
+        if $(MSGMERGE) $(MSGMERGE_OPTIONS) $$lang.po $(DOMAIN).pot -o $$tmpdir/$$lang.new.po; then \
+          if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
+            rm -f $$tmpdir/$$lang.new.po; \
+          else \
+            if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \
+              :; \
+            else \
+              echo "msgmerge for $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \
+              exit 1; \
+            fi; \
+          fi; \
+        else \
+          echo "msgmerge for $$lang.po failed!" 1>&2; \
+          rm -f $$tmpdir/$$lang.new.po; \
+          exit 1; \
+        fi) && \
+       $(MAKE) $(SMALLPOFILES_FOR_lang) LL=$$lang
 
 $(DUMMYPOFILES):
 
@@ -393,123 +394,123 @@ $(DUMMYPOFILES):
 # Depend on LL being set.
 
 SMALLPOFILES_FOR_lang = \
-  ../hello-c/po/$$lang.po \
-  ../hello-c-gnome/po/$$lang.po \
-  ../hello-c-gnome3/po/$$lang.po \
-  ../hello-c++/po/$$lang.po \
-  ../hello-c++-qt/po/$$lang.po \
-  ../hello-c++-kde/po/$$lang.po \
-  ../hello-c++-gnome/po/$$lang.po \
-  ../hello-c++-wxwidgets/po/$$lang.po \
-  ../hello-objc/po/$$lang.po \
-  ../hello-objc-gnustep/po/$$lang.po \
-  ../hello-objc-gnome/po/$$lang.po \
-  ../hello-sh/po/$$lang.po \
-  ../hello-python/po/$$lang.po \
-  ../hello-clisp/po/$$lang.po \
-  ../hello-librep/po/$$lang.po \
-  ../hello-guile/po/$$lang.po \
-  ../hello-smalltalk/po/$$lang.po \
-  ../hello-java/po/$$lang.po \
-  ../hello-java-awt/po/$$lang.po \
-  ../hello-java-swing/po/$$lang.po \
-  ../hello-java-qtjambi/po/$$lang.po \
-  ../hello-csharp/po/$$lang.po \
-  ../hello-csharp-forms/po/$$lang.po \
-  ../hello-gawk/po/$$lang.po \
-  ../hello-pascal/po/$$lang.po \
-  ../hello-ycp/po/$$lang.po \
-  ../hello-tcl/po/$$lang.po \
-  ../hello-tcl-tk/po/$$lang.po \
-  ../hello-perl/po/$$lang.po \
-  ../hello-php/po/$$lang.po
+  $(srcdir)/../hello-c/po/$$lang.po \
+  $(srcdir)/../hello-c-gnome/po/$$lang.po \
+  $(srcdir)/../hello-c-gnome3/po/$$lang.po \
+  $(srcdir)/../hello-c++/po/$$lang.po \
+  $(srcdir)/../hello-c++-qt/po/$$lang.po \
+  $(srcdir)/../hello-c++-kde/po/$$lang.po \
+  $(srcdir)/../hello-c++-gnome/po/$$lang.po \
+  $(srcdir)/../hello-c++-wxwidgets/po/$$lang.po \
+  $(srcdir)/../hello-objc/po/$$lang.po \
+  $(srcdir)/../hello-objc-gnustep/po/$$lang.po \
+  $(srcdir)/../hello-objc-gnome/po/$$lang.po \
+  $(srcdir)/../hello-sh/po/$$lang.po \
+  $(srcdir)/../hello-python/po/$$lang.po \
+  $(srcdir)/../hello-clisp/po/$$lang.po \
+  $(srcdir)/../hello-librep/po/$$lang.po \
+  $(srcdir)/../hello-guile/po/$$lang.po \
+  $(srcdir)/../hello-smalltalk/po/$$lang.po \
+  $(srcdir)/../hello-java/po/$$lang.po \
+  $(srcdir)/../hello-java-awt/po/$$lang.po \
+  $(srcdir)/../hello-java-swing/po/$$lang.po \
+  $(srcdir)/../hello-java-qtjambi/po/$$lang.po \
+  $(srcdir)/../hello-csharp/po/$$lang.po \
+  $(srcdir)/../hello-csharp-forms/po/$$lang.po \
+  $(srcdir)/../hello-gawk/po/$$lang.po \
+  $(srcdir)/../hello-pascal/po/$$lang.po \
+  $(srcdir)/../hello-ycp/po/$$lang.po \
+  $(srcdir)/../hello-tcl/po/$$lang.po \
+  $(srcdir)/../hello-tcl-tk/po/$$lang.po \
+  $(srcdir)/../hello-perl/po/$$lang.po \
+  $(srcdir)/../hello-php/po/$$lang.po
 
-../hello-c/po/$(LL).po: hello-c.pot $(LL).po
-       $(SHELL) mmsmallpo.sh hello-c $(LL)
+$(srcdir)/../hello-c/po/$(LL).po: $(srcdir)/hello-c.pot $(srcdir)/$(LL).po
+       cd $(srcdir) && $(SHELL) mmsmallpo.sh hello-c $(LL)
 
-../hello-c-gnome/po/$(LL).po: hello-c-gnome.pot $(LL).po
-       $(SHELL) mmsmallpo.sh hello-c-gnome $(LL)
+$(srcdir)/../hello-c-gnome/po/$(LL).po: $(srcdir)/hello-c-gnome.pot $(srcdir)/$(LL).po
+       cd $(srcdir) && $(SHELL) mmsmallpo.sh hello-c-gnome $(LL)
 
-../hello-c-gnome3/po/$(LL).po: hello-c-gnome3.pot $(LL).po
-       $(SHELL) mmsmallpo.sh hello-c-gnome3 $(LL)
+$(srcdir)/../hello-c-gnome3/po/$(LL).po: $(srcdir)/hello-c-gnome3.pot $(srcdir)/$(LL).po
+       cd $(srcdir) && $(SHELL) mmsmallpo.sh hello-c-gnome3 $(LL)
 
-../hello-c++/po/$(LL).po: hello-c++.pot $(LL).po
-       $(SHELL) mmsmallpo.sh hello-c++ $(LL)
+$(srcdir)/../hello-c++/po/$(LL).po: $(srcdir)/hello-c++.pot $(srcdir)/$(LL).po
+       cd $(srcdir) && $(SHELL) mmsmallpo.sh hello-c++ $(LL)
 
-../hello-c++-qt/po/$(LL).po: hello-c++-qt.pot $(LL).po
-       $(SHELL) mmsmallpo.sh hello-c++-qt $(LL)
+$(srcdir)/../hello-c++-qt/po/$(LL).po: $(srcdir)/hello-c++-qt.pot $(srcdir)/$(LL).po
+       cd $(srcdir) && $(SHELL) mmsmallpo.sh hello-c++-qt $(LL)
 
-../hello-c++-kde/po/$(LL).po: hello-c++-kde.pot $(LL).po
-       $(SHELL) mmsmallpo.sh hello-c++-kde $(LL)
+$(srcdir)/../hello-c++-kde/po/$(LL).po: $(srcdir)/hello-c++-kde.pot $(srcdir)/$(LL).po
+       cd $(srcdir) && $(SHELL) mmsmallpo.sh hello-c++-kde $(LL)
 
-../hello-c++-gnome/po/$(LL).po: hello-c++-gnome.pot $(LL).po
-       $(SHELL) mmsmallpo.sh hello-c++-gnome $(LL)
+$(srcdir)/../hello-c++-gnome/po/$(LL).po: $(srcdir)/hello-c++-gnome.pot $(srcdir)/$(LL).po
+       cd $(srcdir) && $(SHELL) mmsmallpo.sh hello-c++-gnome $(LL)
 
-../hello-c++-wxwidgets/po/$(LL).po: hello-c++-wxwidgets.pot $(LL).po
-       $(SHELL) mmsmallpo.sh hello-c++-wxwidgets $(LL)
+$(srcdir)/../hello-c++-wxwidgets/po/$(LL).po: $(srcdir)/hello-c++-wxwidgets.pot $(srcdir)/$(LL).po
+       cd $(srcdir) && $(SHELL) mmsmallpo.sh hello-c++-wxwidgets $(LL)
 
-../hello-objc/po/$(LL).po: hello-objc.pot $(LL).po
-       $(SHELL) mmsmallpo.sh hello-objc $(LL)
+$(srcdir)/../hello-objc/po/$(LL).po: $(srcdir)/hello-objc.pot $(srcdir)/$(LL).po
+       cd $(srcdir) && $(SHELL) mmsmallpo.sh hello-objc $(LL)
 
-../hello-objc-gnustep/po/$(LL).po: hello-objc-gnustep.pot $(LL).po
-       $(SHELL) mmsmallpo.sh hello-objc-gnustep $(LL)
+$(srcdir)/../hello-objc-gnustep/po/$(LL).po: $(srcdir)/hello-objc-gnustep.pot $(srcdir)/$(LL).po
+       cd $(srcdir) && $(SHELL) mmsmallpo.sh hello-objc-gnustep $(LL)
 
-../hello-objc-gnome/po/$(LL).po: hello-objc-gnome.pot $(LL).po
-       $(SHELL) mmsmallpo.sh hello-objc-gnome $(LL)
+$(srcdir)/../hello-objc-gnome/po/$(LL).po: $(srcdir)/hello-objc-gnome.pot $(srcdir)/$(LL).po
+       cd $(srcdir) && $(SHELL) mmsmallpo.sh hello-objc-gnome $(LL)
 
-../hello-sh/po/$(LL).po: hello-sh.pot $(LL).po
-       $(SHELL) mmsmallpo.sh hello-sh $(LL)
+$(srcdir)/../hello-sh/po/$(LL).po: $(srcdir)/hello-sh.pot $(srcdir)/$(LL).po
+       cd $(srcdir) && $(SHELL) mmsmallpo.sh hello-sh $(LL)
 
-../hello-python/po/$(LL).po: hello-python.pot $(LL).po
-       $(SHELL) mmsmallpo.sh hello-python $(LL)
+$(srcdir)/../hello-python/po/$(LL).po: $(srcdir)/hello-python.pot $(srcdir)/$(LL).po
+       cd $(srcdir) && $(SHELL) mmsmallpo.sh hello-python $(LL)
 
-../hello-clisp/po/$(LL).po: hello-clisp.pot $(LL).po
-       $(SHELL) mmsmallpo.sh hello-clisp $(LL)
+$(srcdir)/../hello-clisp/po/$(LL).po: $(srcdir)/hello-clisp.pot $(srcdir)/$(LL).po
+       cd $(srcdir) && $(SHELL) mmsmallpo.sh hello-clisp $(LL)
 
-../hello-librep/po/$(LL).po: hello-librep.pot $(LL).po
-       $(SHELL) mmsmallpo.sh hello-librep $(LL)
+$(srcdir)/../hello-librep/po/$(LL).po: $(srcdir)/hello-librep.pot $(srcdir)/$(LL).po
+       cd $(srcdir) && $(SHELL) mmsmallpo.sh hello-librep $(LL)
 
-../hello-guile/po/$(LL).po: hello-guile.pot $(LL).po
-       $(SHELL) mmsmallpo.sh hello-guile $(LL)
+$(srcdir)/../hello-guile/po/$(LL).po: $(srcdir)/hello-guile.pot $(srcdir)/$(LL).po
+       cd $(srcdir) && $(SHELL) mmsmallpo.sh hello-guile $(LL)
 
-../hello-smalltalk/po/$(LL).po: hello-smalltalk.pot $(LL).po
-       $(SHELL) mmsmallpo.sh hello-smalltalk $(LL)
+$(srcdir)/../hello-smalltalk/po/$(LL).po: $(srcdir)/hello-smalltalk.pot $(srcdir)/$(LL).po
+       cd $(srcdir) && $(SHELL) mmsmallpo.sh hello-smalltalk $(LL)
 
-../hello-java/po/$(LL).po: hello-java.pot $(LL).po
-       $(SHELL) mmsmallpo.sh hello-java $(LL)
+$(srcdir)/../hello-java/po/$(LL).po: $(srcdir)/hello-java.pot $(srcdir)/$(LL).po
+       cd $(srcdir) && $(SHELL) mmsmallpo.sh hello-java $(LL)
 
-../hello-java-awt/po/$(LL).po: hello-java-awt.pot $(LL).po
-       $(SHELL) mmsmallpo.sh hello-java-awt $(LL)
+$(srcdir)/../hello-java-awt/po/$(LL).po: $(srcdir)/hello-java-awt.pot $(srcdir)/$(LL).po
+       cd $(srcdir) && $(SHELL) mmsmallpo.sh hello-java-awt $(LL)
 
-../hello-java-swing/po/$(LL).po: hello-java-swing.pot $(LL).po
-       $(SHELL) mmsmallpo.sh hello-java-swing $(LL)
+$(srcdir)/../hello-java-swing/po/$(LL).po: $(srcdir)/hello-java-swing.pot $(srcdir)/$(LL).po
+       cd $(srcdir) && $(SHELL) mmsmallpo.sh hello-java-swing $(LL)
 
-../hello-java-qtjambi/po/$(LL).po: hello-java-qtjambi.pot $(LL).po
-       $(SHELL) mmsmallpo.sh hello-java-qtjambi $(LL)
+$(srcdir)/../hello-java-qtjambi/po/$(LL).po: $(srcdir)/hello-java-qtjambi.pot $(srcdir)/$(LL).po
+       cd $(srcdir) && $(SHELL) mmsmallpo.sh hello-java-qtjambi $(LL)
 
-../hello-csharp/po/$(LL).po: hello-csharp.pot $(LL).po
-       $(SHELL) mmsmallpo.sh hello-csharp $(LL)
+$(srcdir)/../hello-csharp/po/$(LL).po: $(srcdir)/hello-csharp.pot $(srcdir)/$(LL).po
+       cd $(srcdir) && $(SHELL) mmsmallpo.sh hello-csharp $(LL)
 
-../hello-csharp-forms/po/$(LL).po: hello-csharp-forms.pot $(LL).po
-       $(SHELL) mmsmallpo.sh hello-csharp-forms $(LL)
+$(srcdir)/../hello-csharp-forms/po/$(LL).po: $(srcdir)/hello-csharp-forms.pot $(srcdir)/$(LL).po
+       cd $(srcdir) && $(SHELL) mmsmallpo.sh hello-csharp-forms $(LL)
 
-../hello-gawk/po/$(LL).po: hello-gawk.pot $(LL).po
-       $(SHELL) mmsmallpo.sh hello-gawk $(LL)
+$(srcdir)/../hello-gawk/po/$(LL).po: $(srcdir)/hello-gawk.pot $(srcdir)/$(LL).po
+       cd $(srcdir) && $(SHELL) mmsmallpo.sh hello-gawk $(LL)
 
-../hello-pascal/po/$(LL).po: hello-pascal.pot $(LL).po
-       $(SHELL) mmsmallpo.sh hello-pascal $(LL)
+$(srcdir)/../hello-pascal/po/$(LL).po: $(srcdir)/hello-pascal.pot $(srcdir)/$(LL).po
+       cd $(srcdir) && $(SHELL) mmsmallpo.sh hello-pascal $(LL)
 
-../hello-ycp/po/$(LL).po: hello-ycp.pot $(LL).po
-       $(SHELL) mmsmallpo.sh hello-ycp $(LL)
+$(srcdir)/../hello-ycp/po/$(LL).po: $(srcdir)/hello-ycp.pot $(srcdir)/$(LL).po
+       cd $(srcdir) && $(SHELL) mmsmallpo.sh hello-ycp $(LL)
 
-../hello-tcl/po/$(LL).po: hello-tcl.pot $(LL).po
-       $(SHELL) mmsmallpo.sh hello-tcl $(LL)
+$(srcdir)/../hello-tcl/po/$(LL).po: $(srcdir)/hello-tcl.pot $(srcdir)/$(LL).po
+       cd $(srcdir) && $(SHELL) mmsmallpo.sh hello-tcl $(LL)
 
-../hello-tcl-tk/po/$(LL).po: hello-tcl-tk.pot $(LL).po
-       $(SHELL) mmsmallpo.sh hello-tcl-tk $(LL)
+$(srcdir)/../hello-tcl-tk/po/$(LL).po: $(srcdir)/hello-tcl-tk.pot $(srcdir)/$(LL).po
+       cd $(srcdir) && $(SHELL) mmsmallpo.sh hello-tcl-tk $(LL)
 
-../hello-perl/po/$(LL).po: hello-perl.pot $(LL).po
-       $(SHELL) mmsmallpo.sh hello-perl $(LL)
+$(srcdir)/../hello-perl/po/$(LL).po: $(srcdir)/hello-perl.pot $(srcdir)/$(LL).po
+       cd $(srcdir) && $(SHELL) mmsmallpo.sh hello-perl $(LL)
 
-../hello-php/po/$(LL).po: hello-php.pot $(LL).po
-       $(SHELL) mmsmallpo.sh hello-php $(LL)
+$(srcdir)/../hello-php/po/$(LL).po: $(srcdir)/hello-php.pot $(srcdir)/$(LL).po
+       cd $(srcdir) && $(SHELL) mmsmallpo.sh hello-php $(LL)

diff --git a/gettext-tools/examples/po/xsmallpot.sh b/gettext-tools/examples/po/xsmallpot.sh
index bf7c21b3f4d0005d44a951870faf0671a9c64171..ade5b473d78cf5b9f7e0e30a6fc6bfdd4afe3821 100755 (executable)
--- a/gettext-tools/examples/po/xsmallpot.sh
+++ b/gettext-tools/examples/po/xsmallpot.sh
@@ -58,7 +58,7 @@ cd po
 make $potfile
 sed -e "/^#:/ {
 s, \\([^ ]\\), $directory/\\1,g
-}" < $potfile > ../../po/$potfile
+}" < $potfile > "$abs_srcdir"/$potfile
 cd ..
 cd ..
 rm -rf tmp-$directory