Fix problem from recent commit where non GNU-format message catalogs would

Wed Dec 11 14:06:50 2002  Owen Taylor  <otaylor@redhat.com>

        * po/Makefile.in.in: Fix problem from recent commit where
        non GNU-format message catalogs would be installed in
        datadir. Remove some leftover setting of PATH=../src:$PATH.

diff --git a/po/ChangeLog b/po/ChangeLog
index f0b082b4165b6ffd361daf5fca45ebbd8256a3b1..f4ec8907fc6ec57ae6842ece222118905f1f34c2 100644 (file)
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,9 @@
+Wed Dec 11 14:06:50 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * po/Makefile.in.in: Fix problem from recent commit where
+       non GNU-format message catalogs would be installed in
+       datadir. Remove some leftover setting of PATH=../src:$PATH.
+
 2002-12-11 Pauli Virtanen <pauli.virtanen@hut.fi>
 
        * fi.po: Updated Finnish translation.

diff --git a/po/Makefile.in.in b/po/Makefile.in.in
index d010dcf499a2f460b050b9dc3ee66bf7a3e716fa..185c1c1d9b26cc419a904f73f95d52cc09ed197b 100644 (file)
--- a/po/Makefile.in.in
+++ b/po/Makefile.in.in
@@ -23,7 +23,8 @@ VPATH = @srcdir@
 prefix = @prefix@
 exec_prefix = @exec_prefix@
 datadir = @datadir@
-localedir = $(datadir)/locale
+libdir = @libdir@
+localedir = $(libdir)/locale
 gnulocaledir = $(datadir)/locale
 gettextsrcdir = $(datadir)/gettext/po
 subdir = po
@@ -34,10 +35,10 @@ MKINSTALLDIRS = $(top_srcdir)/@MKINSTALLDIRS@
 
 CC = @CC@
 GENCAT = @GENCAT@
-GMSGFMT = PATH=../src:$$PATH @GMSGFMT@
+GMSGFMT = @GMSGFMT@
 MSGFMT = @MSGFMT@
-XGETTEXT = PATH=../src:$$PATH @XGETTEXT@
-MSGMERGE = PATH=../src:$$PATH msgmerge
+XGETTEXT = @XGETTEXT@
+MSGMERGE = msgmerge
 
 DEFS = @DEFS@
 CFLAGS = @CFLAGS@
@@ -212,7 +213,6 @@ dist distdir: update-po $(DISTFILES)
 
 update-po: Makefile
        $(MAKE) $(GETTEXT_PACKAGE).pot
-       PATH=`pwd`/../src:$$PATH; \
        cd $(srcdir); \
        catalogs='$(CATALOGS)'; \
        for cat in $$catalogs; do \