summaryrefslogtreecommitdiff
path: root/po/Makefile.in.in
diff options
context:
space:
mode:
authorSoeren Sandmann <sandmann@daimi.au.dk>2004-07-20 02:26:06 +0000
committerSøren Sandmann Pedersen <ssp@src.gnome.org>2004-07-20 02:26:06 +0000
commit9d2a946813797d812a6c16fe0618eea9d8cd95f9 (patch)
treeb80ce431a99af0a6794992b1d6eac73b00ce83f6 /po/Makefile.in.in
parent04ec6a9d23ea21f9cb9010c4db45029eafd345c8 (diff)
downloadgtk+-9d2a946813797d812a6c16fe0618eea9d8cd95f9.tar.gz
=== Released 2.5.0 ===GTK_2_5_0
Sun Jul 18 17:21:10 2004 Soeren Sandmann <sandmann@daimi.au.dk> * === Released 2.5.0 === * NEWS: updates * tests/testcombo.c: Fix compilation
Diffstat (limited to 'po/Makefile.in.in')
-rw-r--r--po/Makefile.in.in26
1 files changed, 7 insertions, 19 deletions
diff --git a/po/Makefile.in.in b/po/Makefile.in.in
index 2befb1a04e..092b4e0dc3 100644
--- a/po/Makefile.in.in
+++ b/po/Makefile.in.in
@@ -21,7 +21,6 @@ SHELL = /bin/sh
srcdir = @srcdir@
top_srcdir = @top_srcdir@
-top_builddir = ..
VPATH = @srcdir@
prefix = @prefix@
@@ -42,10 +41,7 @@ GENCAT = @GENCAT@
GMSGFMT = @GMSGFMT@
MSGFMT = @MSGFMT@
XGETTEXT = @XGETTEXT@
-INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
-INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-MSGMERGE = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist
-GENPOT = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot
+MSGMERGE = msgmerge
DEFS = @DEFS@
CFLAGS = @CFLAGS@
@@ -95,7 +91,12 @@ all-yes: $(CATALOGS)
all-no:
$(srcdir)/$(GETTEXT_PACKAGE).pot: $(POTFILES)
- $(GENPOT)
+ $(XGETTEXT) --default-domain=$(GETTEXT_PACKAGE) --directory=$(top_srcdir) \
+ --add-comments --keyword=_ --keyword=N_ \
+ --files-from=$(srcdir)/POTFILES.in \
+ && test ! -f $(GETTEXT_PACKAGE).po \
+ || ( rm -f $(srcdir)/$(GETTEXT_PACKAGE).pot \
+ && mv $(GETTEXT_PACKAGE).po $(srcdir)/$(GETTEXT_PACKAGE).pot )
install: install-exec install-data
install-exec:
@@ -225,19 +226,6 @@ update-po: Makefile
fi; \
done
-.po: Makefile
- $(MAKE) $(PACKAGE).pot;
- PATH=`pwd`/../src:$$PATH; \
- echo; printf "$*: "; \
- if $(MSGMERGE) $*; then \
- rm -f $*.old.po; \
- else \
- echo "msgmerge for * failed!"; \
- mv $*.old.po $*.po; \
- fi; \
- msgfmt --statistics $*.po; echo;
-
-
# 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