summaryrefslogtreecommitdiff
path: root/po
diff options
context:
space:
mode:
authorJim Meyering <jim@meyering.net>1996-04-03 12:52:22 +0000
committerJim Meyering <jim@meyering.net>1996-04-03 12:52:22 +0000
commite00bceb7f29b60388afd41a3eba8cfbdb09e6ec1 (patch)
tree7843688320248c32a58f20a4befc375e6b5949ce /po
parent58dce3046193e70472c85c73c9da149380f7cf4b (diff)
downloadcoreutils-e00bceb7f29b60388afd41a3eba8cfbdb09e6ec1.tar.xz
update from gettext-0.10.11
Diffstat (limited to 'po')
-rw-r--r--po/Makefile.in.in14
1 files changed, 12 insertions, 2 deletions
diff --git a/po/Makefile.in.in b/po/Makefile.in.in
index a51717b39..e36a8cb66 100644
--- a/po/Makefile.in.in
+++ b/po/Makefile.in.in
@@ -41,7 +41,7 @@ GENCAT = @GENCAT@
GMSGFMT = @GMSGFMT@
MSGFMT = @MSGFMT@
XGETTEXT = @XGETTEXT@
-MSGMERGE = msgmerge -f
+MSGMERGE = msgmerge
DEFS = @DEFS@
CFLAGS = @CFLAGS@
@@ -88,7 +88,7 @@ INSTOBJEXT = @INSTOBJEXT@
all: all-@USE_NLS@
all-yes: cat-id-tbl.c $(CATALOGS)
-all-no:
+all-no all-gettext:
$(PACKAGE).pot: $(POTFILES)
$(XGETTEXT) --default-domain=$(PACKAGE) --directory=$(top_srcdir) \
@@ -134,6 +134,14 @@ install-data: all
else \
$(INSTALL_DATA) $(srcdir)/$$cat $$dir/$(PACKAGE)$(INSTOBJEXT); \
fi; \
+ if test -r $$cat.m; then \
+ $(INSTALL_DATA) $$cat.m $$dir/$(PACKAGE)$(INSTOBJEXT).m; \
+ else \
+ if test -r $(srcdir)/$$cat.m ; then \
+ $(INSTALL_DATA) $(srcdir)/$$cat.m \
+ $$dir/$(PACKAGE)$(INSTOBJEXT).m; \
+ fi; \
+ fi; \
done
# This installation goal is only used in GNU gettext. Packages which
@@ -148,7 +156,9 @@ uninstall:
for cat in $$catalogs; do \
lang=`echo $$cat | sed 's/$(CATOBJEXT)$$//'`; \
rm -f $(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
+ rm -f $(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \
rm -f $(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
+ rm -f $(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \
done
rm -f $(gettextsrcdir)/po-Makefile.in.in