mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2024-12-25 15:06:14 +01:00
Updated from gettext-0.10.35, to fix broken DESTDIR handling
This commit is contained in:
parent
809ea8e7f8
commit
dcb3811885
@ -1,3 +1,8 @@
|
|||||||
|
2001-09-05 Ross Golder <ross@golder.org>
|
||||||
|
|
||||||
|
* Makefile.in.in: Updated from more recent gettext to fix
|
||||||
|
problem with DESTDIR.
|
||||||
|
|
||||||
2001-09-02 Carlos Perelló Marín <carlos@gnome-db.org>
|
2001-09-02 Carlos Perelló Marín <carlos@gnome-db.org>
|
||||||
|
|
||||||
* es.po: Added Spanish translation by josé antonio salgueiro
|
* es.po: Added Spanish translation by josé antonio salgueiro
|
||||||
|
@ -1,18 +1,18 @@
|
|||||||
# Makefile for program source directory in GNU NLS utilities package.
|
# Makefile for program source directory in GNU NLS utilities package.
|
||||||
# Copyright (C) 1995, 1996, 1997 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
|
# Copyright (C) 1995-1997, 2000, 2001 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
|
||||||
#
|
#
|
||||||
# This file file be copied and used freely without restrictions. It can
|
# This file file be copied and used freely without restrictions. It can
|
||||||
# be used in projects which are not available under the GNU Public License
|
# be used in projects which are not available under the GNU Public License
|
||||||
# but which still want to provide support for the GNU gettext functionality.
|
# but which still want to provide support for the GNU gettext functionality.
|
||||||
# Please note that the actual code is *not* freely available.
|
# Please note that the actual code is *not* freely available.
|
||||||
#
|
|
||||||
# - Modified by Owen Taylor <otaylor@redhat.com> to use GETTEXT_PACKAGE
|
|
||||||
# instead of PACKAGE and to look for po2tbl in ./ not in intl/
|
|
||||||
#
|
|
||||||
|
|
||||||
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
|
PACKAGE = @PACKAGE@
|
||||||
VERSION = @VERSION@
|
VERSION = @VERSION@
|
||||||
|
|
||||||
|
# These two variables depend on the location of this directory.
|
||||||
|
subdir = po
|
||||||
|
top_builddir = ..
|
||||||
|
|
||||||
SHELL = /bin/sh
|
SHELL = /bin/sh
|
||||||
@SET_MAKE@
|
@SET_MAKE@
|
||||||
|
|
||||||
@ -22,22 +22,20 @@ VPATH = @srcdir@
|
|||||||
|
|
||||||
prefix = @prefix@
|
prefix = @prefix@
|
||||||
exec_prefix = @exec_prefix@
|
exec_prefix = @exec_prefix@
|
||||||
datadir = $(prefix)/@DATADIRNAME@
|
datadir = @datadir@
|
||||||
localedir = $(datadir)/locale
|
localedir = $(datadir)/locale
|
||||||
gnulocaledir = $(prefix)/share/locale
|
gettextsrcdir = $(datadir)/gettext/po
|
||||||
gettextsrcdir = $(prefix)/share/gettext/po
|
|
||||||
subdir = po
|
|
||||||
|
|
||||||
INSTALL = @INSTALL@
|
INSTALL = @INSTALL@
|
||||||
INSTALL_DATA = @INSTALL_DATA@
|
INSTALL_DATA = @INSTALL_DATA@
|
||||||
MKINSTALLDIRS = $(top_srcdir)/@MKINSTALLDIRS@
|
MKINSTALLDIRS = @MKINSTALLDIRS@
|
||||||
|
mkinstalldirs = $(SHELL) `case "$(MKINSTALLDIRS)" in /*) echo "$(MKINSTALLDIRS)" ;; *) echo "$(top_builddir)/$(MKINSTALLDIRS)" ;; esac`
|
||||||
|
|
||||||
CC = @CC@
|
CC = @CC@
|
||||||
GENCAT = @GENCAT@
|
GMSGFMT = @GMSGFMT@
|
||||||
GMSGFMT = PATH=../src:$$PATH @GMSGFMT@
|
|
||||||
MSGFMT = @MSGFMT@
|
MSGFMT = @MSGFMT@
|
||||||
XGETTEXT = PATH=../src:$$PATH @XGETTEXT@
|
XGETTEXT = @XGETTEXT@
|
||||||
MSGMERGE = PATH=../src:$$PATH msgmerge
|
MSGMERGE = msgmerge
|
||||||
|
|
||||||
DEFS = @DEFS@
|
DEFS = @DEFS@
|
||||||
CFLAGS = @CFLAGS@
|
CFLAGS = @CFLAGS@
|
||||||
@ -47,125 +45,79 @@ INCLUDES = -I.. -I$(top_srcdir)/intl
|
|||||||
|
|
||||||
COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS)
|
COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS)
|
||||||
|
|
||||||
SOURCES = cat-id-tbl.c
|
|
||||||
POFILES = @POFILES@
|
POFILES = @POFILES@
|
||||||
GMOFILES = @GMOFILES@
|
GMOFILES = @GMOFILES@
|
||||||
DISTFILES = ChangeLog Makefile.in.in POTFILES.in $(GETTEXT_PACKAGE).pot \
|
DISTFILES = ChangeLog Makefile.in.in POTFILES.in $(PACKAGE).pot \
|
||||||
stamp-cat-id $(POFILES) $(GMOFILES) $(SOURCES)
|
$(POFILES) $(GMOFILES)
|
||||||
|
|
||||||
POTFILES = \
|
POTFILES = \
|
||||||
|
|
||||||
CATALOGS = @CATALOGS@
|
CATALOGS = @CATALOGS@
|
||||||
CATOBJEXT = @CATOBJEXT@
|
|
||||||
INSTOBJEXT = @INSTOBJEXT@
|
|
||||||
|
|
||||||
.SUFFIXES:
|
.SUFFIXES:
|
||||||
.SUFFIXES: .c .o .po .pox .gmo .mo .msg .cat
|
.SUFFIXES: .c .o .po .pox .gmo .mo
|
||||||
|
|
||||||
.c.o:
|
.c.o:
|
||||||
$(COMPILE) $<
|
$(COMPILE) $<
|
||||||
|
|
||||||
.po.pox:
|
.po.pox:
|
||||||
$(MAKE) $(GETTEXT_PACKAGE).pot
|
$(MAKE) $(PACKAGE).pot
|
||||||
$(MSGMERGE) $< $(srcdir)/$(GETTEXT_PACKAGE).pot -o $*.pox
|
$(MSGMERGE) $< $(srcdir)/$(PACKAGE).pot -o $*.pox
|
||||||
|
|
||||||
.po.mo:
|
.po.mo:
|
||||||
$(MSGFMT) -o $@ $<
|
$(MSGFMT) -o $@ $<
|
||||||
|
|
||||||
.po.gmo:
|
.po.gmo:
|
||||||
file=$(srcdir)/`echo $* | sed 's,.*/,,'`.gmo \
|
file=$(srcdir)/`echo $* | sed 's,.*/,,'`.gmo \
|
||||||
&& rm -f $$file && $(GMSGFMT) -o $$file $<
|
&& rm -f $$file && $(GMSGFMT) --statistics -o $$file $<
|
||||||
|
|
||||||
.po.cat:
|
|
||||||
sed -f ../intl/po2msg.sed < $< > $*.msg \
|
|
||||||
&& rm -f $@ && $(GENCAT) $@ $*.msg
|
|
||||||
|
|
||||||
|
|
||||||
all: all-@USE_NLS@
|
all: all-@USE_NLS@
|
||||||
|
|
||||||
all-yes: cat-id-tbl.c $(CATALOGS)
|
all-yes: $(CATALOGS)
|
||||||
all-no:
|
all-no:
|
||||||
|
|
||||||
$(srcdir)/$(GETTEXT_PACKAGE).pot: $(POTFILES)
|
# Note: Target 'all' must not depend on target '$(srcdir)/$(PACKAGE).pot',
|
||||||
$(XGETTEXT) --default-domain=$(GETTEXT_PACKAGE) --directory=$(top_srcdir) \
|
# otherwise packages like GCC can not be built if only parts of the source
|
||||||
|
# have been downloaded.
|
||||||
|
|
||||||
|
$(srcdir)/$(PACKAGE).pot: $(POTFILES) $(srcdir)/POTFILES.in
|
||||||
|
$(XGETTEXT) --default-domain=$(PACKAGE) --directory=$(top_srcdir) \
|
||||||
--add-comments --keyword=_ --keyword=N_ \
|
--add-comments --keyword=_ --keyword=N_ \
|
||||||
--files-from=$(srcdir)/POTFILES.in \
|
--files-from=$(srcdir)/POTFILES.in \
|
||||||
&& test ! -f $(GETTEXT_PACKAGE).po \
|
&& test ! -f $(PACKAGE).po \
|
||||||
|| ( rm -f $(srcdir)/$(GETTEXT_PACKAGE).pot \
|
|| ( rm -f $(srcdir)/$(PACKAGE).pot \
|
||||||
&& mv $(GETTEXT_PACKAGE).po $(srcdir)/$(GETTEXT_PACKAGE).pot )
|
&& mv $(PACKAGE).po $(srcdir)/$(PACKAGE).pot )
|
||||||
|
|
||||||
$(srcdir)/cat-id-tbl.c: stamp-cat-id; @:
|
|
||||||
$(srcdir)/stamp-cat-id: $(GETTEXT_PACKAGE).pot
|
|
||||||
rm -f cat-id-tbl.tmp
|
|
||||||
sed -f ./po2tbl.sed $(srcdir)/$(GETTEXT_PACKAGE).pot \
|
|
||||||
| sed -e "s/@GETTEXT_PACKAGE NAME@/$(GETTEXT_PACKAGE)/" > cat-id-tbl.tmp
|
|
||||||
if cmp -s cat-id-tbl.tmp $(srcdir)/cat-id-tbl.c; then \
|
|
||||||
rm cat-id-tbl.tmp; \
|
|
||||||
else \
|
|
||||||
echo cat-id-tbl.c changed; \
|
|
||||||
rm -f $(srcdir)/cat-id-tbl.c; \
|
|
||||||
mv cat-id-tbl.tmp $(srcdir)/cat-id-tbl.c; \
|
|
||||||
fi
|
|
||||||
cd $(srcdir) && rm -f stamp-cat-id && echo timestamp > stamp-cat-id
|
|
||||||
|
|
||||||
|
|
||||||
install: install-exec install-data
|
install: install-exec install-data
|
||||||
install-exec:
|
install-exec:
|
||||||
install-data: install-data-@USE_NLS@
|
install-data: install-data-@USE_NLS@
|
||||||
install-data-no: all
|
if test "$(PACKAGE)" = "gettext"; then \
|
||||||
install-data-yes: all
|
$(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
|
||||||
if test -r "$(MKINSTALLDIRS)"; then \
|
|
||||||
$(MKINSTALLDIRS) $(datadir); \
|
|
||||||
else \
|
|
||||||
$(SHELL) $(top_srcdir)/mkinstalldirs $(datadir); \
|
|
||||||
fi
|
|
||||||
@catalogs='$(CATALOGS)'; \
|
|
||||||
for cat in $$catalogs; do \
|
|
||||||
cat=`basename $$cat`; \
|
|
||||||
case "$$cat" in \
|
|
||||||
*.gmo) destdir=$(gnulocaledir);; \
|
|
||||||
*) destdir=$(localedir);; \
|
|
||||||
esac; \
|
|
||||||
lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
|
|
||||||
dir=$$destdir/$$lang/LC_MESSAGES; \
|
|
||||||
if test -r "$(MKINSTALLDIRS)"; then \
|
|
||||||
$(MKINSTALLDIRS) $$dir; \
|
|
||||||
else \
|
|
||||||
$(SHELL) $(top_srcdir)/mkinstalldirs $$dir; \
|
|
||||||
fi; \
|
|
||||||
if test -r $$cat; then \
|
|
||||||
$(INSTALL_DATA) $$cat $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \
|
|
||||||
echo "installing $$cat as $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT)"; \
|
|
||||||
else \
|
|
||||||
$(INSTALL_DATA) $(srcdir)/$$cat $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \
|
|
||||||
echo "installing $(srcdir)/$$cat as" \
|
|
||||||
"$$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT)"; \
|
|
||||||
fi; \
|
|
||||||
if test -r $$cat.m; then \
|
|
||||||
$(INSTALL_DATA) $$cat.m $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \
|
|
||||||
echo "installing $$cat.m as $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m"; \
|
|
||||||
else \
|
|
||||||
if test -r $(srcdir)/$$cat.m ; then \
|
|
||||||
$(INSTALL_DATA) $(srcdir)/$$cat.m \
|
|
||||||
$$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \
|
|
||||||
echo "installing $(srcdir)/$$cat as" \
|
|
||||||
"$$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m"; \
|
|
||||||
else \
|
|
||||||
true; \
|
|
||||||
fi; \
|
|
||||||
fi; \
|
|
||||||
done
|
|
||||||
if test "$(GETTEXT_PACKAGE)" = "gettext"; then \
|
|
||||||
if test -r "$(MKINSTALLDIRS)"; then \
|
|
||||||
$(MKINSTALLDIRS) $(gettextsrcdir); \
|
|
||||||
else \
|
|
||||||
$(SHELL) $(top_srcdir)/mkinstalldirs $(gettextsrcdir); \
|
|
||||||
fi; \
|
|
||||||
$(INSTALL_DATA) $(srcdir)/Makefile.in.in \
|
$(INSTALL_DATA) $(srcdir)/Makefile.in.in \
|
||||||
$(gettextsrcdir)/Makefile.in.in; \
|
$(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \
|
||||||
else \
|
else \
|
||||||
: ; \
|
: ; \
|
||||||
fi
|
fi
|
||||||
|
install-data-no: all
|
||||||
|
install-data-yes: all
|
||||||
|
$(mkinstalldirs) $(DESTDIR)$(datadir)
|
||||||
|
@catalogs='$(CATALOGS)'; \
|
||||||
|
for cat in $$catalogs; do \
|
||||||
|
cat=`basename $$cat`; \
|
||||||
|
lang=`echo $$cat | sed 's/\.gmo$$//'`; \
|
||||||
|
dir=$(localedir)/$$lang/LC_MESSAGES; \
|
||||||
|
$(mkinstalldirs) $(DESTDIR)$$dir; \
|
||||||
|
if test -r $$cat; then \
|
||||||
|
$(INSTALL_DATA) $$cat $(DESTDIR)$$dir/$(PACKAGE).mo; \
|
||||||
|
echo "installing $$cat as $(DESTDIR)$$dir/$(PACKAGE).mo"; \
|
||||||
|
else \
|
||||||
|
$(INSTALL_DATA) $(srcdir)/$$cat $(DESTDIR)$$dir/$(PACKAGE).mo; \
|
||||||
|
echo "installing $(srcdir)/$$cat as" \
|
||||||
|
"$(DESTDIR)$$dir/$(PACKAGE).mo"; \
|
||||||
|
fi; \
|
||||||
|
done
|
||||||
|
|
||||||
# Define this as empty until I found a useful application.
|
# Define this as empty until I found a useful application.
|
||||||
installcheck:
|
installcheck:
|
||||||
@ -174,76 +126,68 @@ uninstall:
|
|||||||
catalogs='$(CATALOGS)'; \
|
catalogs='$(CATALOGS)'; \
|
||||||
for cat in $$catalogs; do \
|
for cat in $$catalogs; do \
|
||||||
cat=`basename $$cat`; \
|
cat=`basename $$cat`; \
|
||||||
lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
|
lang=`echo $$cat | sed 's/\.gmo$$//'`; \
|
||||||
rm -f $(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \
|
rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(PACKAGE).mo; \
|
||||||
rm -f $(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \
|
|
||||||
rm -f $(gnulocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \
|
|
||||||
rm -f $(gnulocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \
|
|
||||||
done
|
done
|
||||||
rm -f $(gettextsrcdir)/po-Makefile.in.in
|
if test "$(PACKAGE)" = "gettext"; then \
|
||||||
|
rm -f $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \
|
||||||
|
else \
|
||||||
|
: ; \
|
||||||
|
fi
|
||||||
|
|
||||||
check: all
|
check: all
|
||||||
|
|
||||||
cat-id-tbl.o: ../intl/libgettext.h
|
|
||||||
|
|
||||||
dvi info tags TAGS ID:
|
dvi info tags TAGS ID:
|
||||||
|
|
||||||
mostlyclean:
|
mostlyclean:
|
||||||
rm -f core core.* *.pox $(GETTEXT_PACKAGE).po *.old.po cat-id-tbl.tmp
|
rm -f core core.* *.pox $(PACKAGE).po *.new.po
|
||||||
rm -fr *.o
|
rm -fr *.o
|
||||||
|
|
||||||
clean: mostlyclean
|
clean: mostlyclean
|
||||||
|
|
||||||
distclean: clean
|
distclean: clean
|
||||||
rm -f Makefile Makefile.in POTFILES *.mo *.msg *.cat *.cat.m
|
rm -f Makefile Makefile.in POTFILES *.mo
|
||||||
|
|
||||||
maintainer-clean: distclean
|
maintainer-clean: distclean
|
||||||
@echo "This command is intended for maintainers to use;"
|
@echo "This command is intended for maintainers to use;"
|
||||||
@echo "it deletes files that may require special tools to rebuild."
|
@echo "it deletes files that may require special tools to rebuild."
|
||||||
rm -f $(GMOFILES)
|
rm -f $(GMOFILES)
|
||||||
|
|
||||||
distdir = ../$(GETTEXT_PACKAGE)-$(VERSION)/$(subdir)
|
distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
|
||||||
dist distdir: update-po $(DISTFILES)
|
dist distdir:
|
||||||
|
$(MAKE) update-po
|
||||||
|
@$(MAKE) dist2
|
||||||
|
# This is a separate target because 'update-po' must be executed before.
|
||||||
|
dist2: $(DISTFILES)
|
||||||
dists="$(DISTFILES)"; \
|
dists="$(DISTFILES)"; \
|
||||||
for file in $$dists; do \
|
for file in $$dists; do \
|
||||||
ln $(srcdir)/$$file $(distdir) 2> /dev/null \
|
if test -f $$file; then dir=.; else dir=$(srcdir); fi; \
|
||||||
|| cp -p $(srcdir)/$$file $(distdir); \
|
cp -p $$dir/$$file $(distdir); \
|
||||||
done
|
done
|
||||||
|
|
||||||
update-po: Makefile
|
update-po: Makefile
|
||||||
$(MAKE) $(GETTEXT_PACKAGE).pot
|
$(MAKE) $(PACKAGE).pot
|
||||||
PATH=`pwd`/../src:$$PATH; \
|
if test "$(PACKAGE)" = "gettext"; then PATH=`pwd`/../src:$$PATH; fi; \
|
||||||
cd $(srcdir); \
|
cd $(srcdir); \
|
||||||
catalogs='$(CATALOGS)'; \
|
catalogs='$(GMOFILES)'; \
|
||||||
for cat in $$catalogs; do \
|
for cat in $$catalogs; do \
|
||||||
cat=`basename $$cat`; \
|
cat=`basename $$cat`; \
|
||||||
lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
|
lang=`echo $$cat | sed 's/\.gmo$$//'`; \
|
||||||
mv $$lang.po $$lang.old.po; \
|
|
||||||
echo "$$lang:"; \
|
echo "$$lang:"; \
|
||||||
if $(MSGMERGE) $$lang.old.po $(GETTEXT_PACKAGE).pot -o $$lang.po; then \
|
if $(MSGMERGE) $$lang.po $(PACKAGE).pot -o $$lang.new.po; then \
|
||||||
rm -f $$lang.old.po; \
|
mv -f $$lang.new.po $$lang.po; \
|
||||||
else \
|
else \
|
||||||
echo "msgmerge for $$cat failed!"; \
|
echo "msgmerge for $$cat failed!"; \
|
||||||
rm -f $$lang.po; \
|
rm -f $$lang.new.po; \
|
||||||
mv $$lang.old.po $$lang.po; \
|
|
||||||
fi; \
|
fi; \
|
||||||
done
|
done
|
||||||
|
$(MAKE) update-gmo
|
||||||
|
|
||||||
POTFILES: POTFILES.in
|
update-gmo: Makefile $(GMOFILES)
|
||||||
( if test 'x$(srcdir)' != 'x.'; then \
|
@:
|
||||||
posrcprefix='$(top_srcdir)/'; \
|
|
||||||
else \
|
|
||||||
posrcprefix="../"; \
|
|
||||||
fi; \
|
|
||||||
rm -f $@-t $@ \
|
|
||||||
&& (sed -e '/^#/d' -e '/^[ ]*$$/d' \
|
|
||||||
-e "s@.*@ $$posrcprefix& \\\\@" < $(srcdir)/$@.in \
|
|
||||||
| sed -e '$$s/\\$$//') > $@-t \
|
|
||||||
&& chmod a-w $@-t \
|
|
||||||
&& mv $@-t $@ )
|
|
||||||
|
|
||||||
Makefile: Makefile.in.in ../config.status POTFILES
|
Makefile: Makefile.in.in $(top_builddir)/config.status POTFILES.in
|
||||||
cd .. \
|
cd $(top_builddir) \
|
||||||
&& CONFIG_FILES=$(subdir)/$@.in CONFIG_HEADERS= \
|
&& CONFIG_FILES=$(subdir)/$@.in CONFIG_HEADERS= \
|
||||||
$(SHELL) ./config.status
|
$(SHELL) ./config.status
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user