po: Re-sync Makefile.in.in

Use the one that ships with gtk+.
This commit is contained in:
Emmanuele Bassi 2010-07-19 16:03:35 +01:00
parent e45b8be71b
commit a7adfd8745

View File

@ -25,23 +25,23 @@ VPATH = @srcdir@
prefix = @prefix@ prefix = @prefix@
exec_prefix = @exec_prefix@ exec_prefix = @exec_prefix@
datarootdir = @datarootdir@
datadir = @datadir@ datadir = @datadir@
datarootdir = @datarootdir@
libdir = @libdir@ libdir = @libdir@
localedir = $(libdir)/locale localedir = $(libdir)/locale
gnulocaledir = $(datadir)/locale gnulocaledir = $(datadir)/locale
gettextsrcdir = $(datadir)/glib-2.0/gettext/po gettextsrcdir = $(datadir)/glib-2.0/gettext/po
subdir = po subdir = po
install_sh = @install_sh@
mkdir_p = $(install_sh) -d
INSTALL = @INSTALL@ INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@ INSTALL_DATA = @INSTALL_DATA@
MKINSTALLDIRS = $(top_srcdir)/@MKINSTALLDIRS@
CC = @CC@ CC = @CC@
GENCAT = @GENCAT@ GENCAT = @GENCAT@
GMSGFMT = @GMSGFMT@ GMSGFMT = @GMSGFMT@
MSGFMT = @MSGFMT@ MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
XGETTEXT = @XGETTEXT@ XGETTEXT = @XGETTEXT@
MSGMERGE = msgmerge MSGMERGE = msgmerge
@ -56,7 +56,7 @@ COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS)
SOURCES = SOURCES =
POFILES = @POFILES@ POFILES = @POFILES@
GMOFILES = @GMOFILES@ GMOFILES = @GMOFILES@
DISTFILES = LINGUAS ChangeLog Makefile.in.in POTFILES.in $(GETTEXT_PACKAGE).pot \ DISTFILES = LINGUAS ChangeLog Makefile.in.in POTFILES.in POTFILES.skip $(GETTEXT_PACKAGE).pot \
$(POFILES) $(GMOFILES) $(SOURCES) $(POFILES) $(GMOFILES) $(SOURCES)
POTFILES = \ POTFILES = \
@ -80,7 +80,7 @@ INSTOBJEXT = @INSTOBJEXT@
.po.gmo: .po.gmo:
file=$(srcdir)/`echo $* | sed 's,.*/,,'`.gmo \ file=$(srcdir)/`echo $* | sed 's,.*/,,'`.gmo \
&& rm -f $$file && $(GMSGFMT) $(MSGFMT_OPTS) -o $$file $< && rm -f $$file && $(GMSGFMT) -c -o $$file $<
.po.cat: .po.cat:
sed -f ../intl/po2msg.sed < $< > $*.msg \ sed -f ../intl/po2msg.sed < $< > $*.msg \
@ -94,17 +94,8 @@ all-no:
$(srcdir)/$(GETTEXT_PACKAGE).pot: $(POTFILES) $(srcdir)/$(GETTEXT_PACKAGE).pot: $(POTFILES)
$(XGETTEXT) --default-domain=$(GETTEXT_PACKAGE) --directory=$(top_srcdir) \ $(XGETTEXT) --default-domain=$(GETTEXT_PACKAGE) --directory=$(top_srcdir) \
--add-comments --keyword --keyword=_ --keyword=N_ \ --add-comments --keyword=_ --keyword=N_ --keyword=C_:1c,2 --keyword=NC_:1c,2 --keyword=P_ \
--keyword=P_ \
--keyword=C_:1c,2 \
--keyword=NC_:1c,2 \
--keyword=g_dcgettext:2 \
--keyword=g_dngettext:2,3 \ --keyword=g_dngettext:2,3 \
--keyword=g_dpgettext2:2c,3 \
--flag=N_:1:pass-c-format \
--flag=C_:2:pass-c-format \
--flag=NC_:2:pass-c-format \
--flag=P_:1:pass-c-format \
--flag=g_dngettext:2:pass-c-format \ --flag=g_dngettext:2:pass-c-format \
--flag=g_strdup_printf:1:c-format \ --flag=g_strdup_printf:1:c-format \
--flag=g_string_printf:2:c-format \ --flag=g_string_printf:2:c-format \
@ -121,6 +112,10 @@ $(srcdir)/$(GETTEXT_PACKAGE).pot: $(POTFILES)
--flag=g_snprintf:3:c-format \ --flag=g_snprintf:3:c-format \
--flag=g_scanner_error:2:c-format \ --flag=g_scanner_error:2:c-format \
--flag=g_scanner_warn:2:c-format \ --flag=g_scanner_warn:2:c-format \
--flag=gtk_message_dialog_format_secondary_markup:2:c-format \
--flag=gtk_message_dialog_format_secondary_text:2:c-format \
--flag=gtk_message_dialog_new:5:c-format \
--flag=gtk_message_dialog_new_with_markup:5:c-format \
--files-from=$(srcdir)/POTFILES.in \ --files-from=$(srcdir)/POTFILES.in \
&& test ! -f $(GETTEXT_PACKAGE).po \ && test ! -f $(GETTEXT_PACKAGE).po \
|| ( rm -f $(srcdir)/$(GETTEXT_PACKAGE).pot \ || ( rm -f $(srcdir)/$(GETTEXT_PACKAGE).pot \
@ -131,12 +126,8 @@ install-exec:
install-data: install-data-@USE_NLS@ install-data: install-data-@USE_NLS@
install-data-no: all install-data-no: all
install-data-yes: all install-data-yes: all
if test -r "$(MKINSTALLDIRS)"; then \ $(mkdir_p) $(DESTDIR)$(datadir); \
$(MKINSTALLDIRS) $(DESTDIR)$(datadir); \ catalogs='$(CATALOGS)'; \
else \
$(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir); \
fi
@catalogs='$(CATALOGS)'; \
for cat in $$catalogs; do \ for cat in $$catalogs; do \
cat=`basename $$cat`; \ cat=`basename $$cat`; \
case "$$cat" in \ case "$$cat" in \
@ -145,11 +136,7 @@ install-data-yes: all
esac; \ esac; \
lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \ lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
dir=$(DESTDIR)$$destdir/$$lang/LC_MESSAGES; \ dir=$(DESTDIR)$$destdir/$$lang/LC_MESSAGES; \
if test -r "$(MKINSTALLDIRS)"; then \ $(mkdir_p) $$dir; \
$(MKINSTALLDIRS) $$dir; \
else \
$(SHELL) $(top_srcdir)/mkinstalldirs $$dir; \
fi; \
if test -r $$cat; then \ if test -r $$cat; then \
$(INSTALL_DATA) $$cat $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \ $(INSTALL_DATA) $$cat $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \
echo "installing $$cat as $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT)"; \ echo "installing $$cat as $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT)"; \
@ -173,11 +160,7 @@ install-data-yes: all
fi; \ fi; \
done done
if test "$(PACKAGE)" = "glib"; then \ if test "$(PACKAGE)" = "glib"; then \
if test -r "$(MKINSTALLDIRS)"; then \ $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \
$(MKINSTALLDIRS) $(DESTDIR)$(gettextsrcdir); \
else \
$(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(gettextsrcdir); \
fi; \
$(INSTALL_DATA) $(srcdir)/Makefile.in.in \ $(INSTALL_DATA) $(srcdir)/Makefile.in.in \
$(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \ $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \
else \ else \
@ -220,7 +203,7 @@ maintainer-clean: distclean
rm -f $(GMOFILES) rm -f $(GMOFILES)
distdir = ../$(GETTEXT_PACKAGE)-$(VERSION)/$(subdir) distdir = ../$(GETTEXT_PACKAGE)-$(VERSION)/$(subdir)
dist distdir: update-po $(DISTFILES) dist distdir: $(DISTFILES)
dists="$(DISTFILES)"; \ dists="$(DISTFILES)"; \
for file in $$dists; do \ for file in $$dists; do \
ln $(srcdir)/$$file $(distdir) 2> /dev/null \ ln $(srcdir)/$$file $(distdir) 2> /dev/null \