Kalle Olavi Niemitalo <[EMAIL PROTECTED]> writes: > OK; I'll post one patch to remove the SUFFIXES, another to fix > po/Makefile for builddir!=srcdir while keeping po/*.gmo in builddir, > a third one for other po/Makefile changes, and then we can keep > discussing (arguing?) where po/*.gmo should be.
Here's the second one:
Fix update-po and check-po when srcdir != builddir.
Now, $(lang).po files are always read and written in srcdir.
Also, document how *.gmo files end up in both srcdir and builddir.
---
commit 18a69857be001bbbcfb388d93a42e3344f30585d
tree 6f51be31fcea4171c08afdfbc4e951ed453fb80e
parent 9de1225d261f4ee77cd7a345b8cdb08e0064f2a0
author Kalle Olavi Niemitalo <[EMAIL PROTECTED]> Tue, 06 Dec 2005 18:09:45 +0200
committer Kalle Olavi Niemitalo <[EMAIL PROTECTED]> Tue, 06 Dec 2005 18:09:45
+0200
po/Makefile | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/po/Makefile b/po/Makefile
index 1aa549a..57b2bdd 100644
--- a/po/Makefile
+++ b/po/Makefile
@@ -12,6 +12,10 @@ MSGMERGE = msgmerge
POTFILES_ABS_LIST = potfiles.list
+# Distributed elinks-*.tar.gz packages include po/*.gmo files, so that
+# users can install ELinks even if they don't have a msgfmt program.
+# However, if srcdir != builddir, then this Makefile ignores the *.gmo
+# files in the srcdir and builds new ones in the builddir.
%.gmo: $(srcdir)/%.po
@file=`echo $* | sed 's,.*/,,'`.gmo \
&& rm -f $$file && echo -n $*": " \
@@ -65,8 +69,8 @@ update-po: Makefile $(srcdir)/$(PACKAGE)
@cd $(srcdir)
@$(foreach lang,$(basename $(if $(strip $(PO)),$(PO),$(GMOFILES))), \
echo -n "$(lang): "; \
- if $(MSGMERGE) $(lang).po $(PACKAGE).pot -o $(lang).new.po; then \
- mv -f $(lang).new.po $(lang).po; \
+ if $(MSGMERGE) $(srcdir)/$(lang).po $(srcdir)/$(PACKAGE).pot -o
$(lang).new.po; then \
+ mv -f $(lang).new.po $(srcdir)/$(lang).po; \
else \
echo "msgmerge failed!"; \
rm -f $(lang).new.po; \
@@ -84,7 +88,7 @@ update-gmo: Makefile $(GMOFILES)
check-po:
@$(foreach lang,$(basename $(if $(strip $(PO)),$(PO),$(GMOFILES))), \
echo -n "$(lang): "; \
- $(GMSGFMT) --check --check-accelerators=~ --verbose --statistics -o
/dev/null $(lang).po; \
+ $(GMSGFMT) --check --check-accelerators=~ --verbose --statistics -o
/dev/null $(srcdir)/$(lang).po; \
)
### Installation and distribution
pgp7SMSctbbvx.pgp
Description: PGP signature
_______________________________________________ elinks-dev mailing list [email protected] http://linuxfromscratch.org/mailman/listinfo/elinks-dev
