diff options
| author | Bruno Haible <bruno@clisp.org> | 2002-01-07 17:41:34 +0000 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2009-06-22 00:35:59 +0200 |
| commit | a52a28f262e9efeb37da1907c7811b95afeaa860 (patch) | |
| tree | 0b642f84716570eb4c2fbcec61c22514178dd774 | |
| parent | e462c5e2796ea9e66b4b906225a1894d939062cd (diff) | |
| download | external_gettext-a52a28f262e9efeb37da1907c7811b95afeaa860.zip external_gettext-a52a28f262e9efeb37da1907c7811b95afeaa860.tar.gz external_gettext-a52a28f262e9efeb37da1907c7811b95afeaa860.tar.bz2 | |
Make po/Makefile work when builddir != srcdir.
| -rw-r--r-- | m4/ChangeLog | 5 | ||||
| -rw-r--r-- | m4/gettext.m4 | 2 | ||||
| -rw-r--r-- | po/ChangeLog | 5 | ||||
| -rw-r--r-- | po/Rules-quot | 2 |
4 files changed, 12 insertions, 2 deletions
diff --git a/m4/ChangeLog b/m4/ChangeLog index 317a056..7b4c9d3 100644 --- a/m4/ChangeLog +++ b/m4/ChangeLog @@ -1,3 +1,8 @@ +2002-01-05 Bruno Haible <bruno@clisp.org> + + * gettext.m4 (AM_PO_SUBDIRS): Look for Rules-* files in the source dir, + not in the build dir. + 2002-01-04 Bruno Haible <bruno@clisp.org> * gettext.m4 (AM_GNU_GETTEXT): If no intl directory exists and GNU diff --git a/m4/gettext.m4 b/m4/gettext.m4 index e59f466..8ffba95 100644 --- a/m4/gettext.m4 +++ b/m4/gettext.m4 @@ -379,7 +379,7 @@ AC_DEFUN([AM_PO_SUBDIRS], fi test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile" sed -e "/^POTFILES =/r $ac_dir/POTFILES" -e "/^# Makevars/r $ac_given_srcdir/$ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" "$ac_dir/Makefile.in" > "$ac_dir/Makefile" - for f in "$ac_dir"/Rules-*; do + for f in "$ac_given_srcdir/$ac_dir"/Rules-*; do if test -f "$f"; then case "$f" in *.orig | *.bak | *~) ;; diff --git a/po/ChangeLog b/po/ChangeLog index 68eb62e..0f94c2e 100644 --- a/po/ChangeLog +++ b/po/ChangeLog @@ -1,5 +1,10 @@ 2002-01-05 Bruno Haible <bruno@clisp.org> + * Rules-quot (.insert-header.po-update-en): Set GETTEXTLIBDIR to an + absolute path, not a relative path. + +2002-01-05 Bruno Haible <bruno@clisp.org> + * Makefile.in.in ($(DOMAIN).pot-update): Renamed from target $(srcdir)/$(DOMAIN).pot. ($(srcdir)/$(DOMAIN).pot): New rule, which normally does nothing. diff --git a/po/Rules-quot b/po/Rules-quot index 132e94f..5f46d23 100644 --- a/po/Rules-quot +++ b/po/Rules-quot @@ -9,7 +9,7 @@ en@boldquot.po-update: en@boldquot.po-update-en .insert-header.po-update-en: @lang=`echo $@ | sed -e 's/\.po-update-en$$//'`; \ - if test "$(PACKAGE)" = "gettext"; then PATH=`pwd`/../src:$$PATH; GETTEXTLIBDIR=$(top_srcdir)/src; export GETTEXTLIBDIR; fi; \ + if test "$(PACKAGE)" = "gettext"; then PATH=`pwd`/../src:$$PATH; GETTEXTLIBDIR=`cd $(top_srcdir)/src && pwd`; export GETTEXTLIBDIR; fi; \ tmpdir=`pwd`; \ echo "$$lang:"; \ ll=`echo $$lang | sed -e 's/@.*//'`; \ |