gnu: texi2html: Fix tests in the absense of gettext.
* gnu/packages/patches/texi2html-i18n.patch: New patch. * gnu/packages/texinfo.scm (texi2html)[source]: Use it. * gnu-system.am (dist_patch_DATA): Add it.
This commit is contained in:
parent
cb8b285adf
commit
ffbf749e6a
|
@ -378,6 +378,7 @@ dist_patch_DATA = \
|
||||||
gnu/packages/patches/tcsh-fix-autotest.patch \
|
gnu/packages/patches/tcsh-fix-autotest.patch \
|
||||||
gnu/packages/patches/teckit-cstdio.patch \
|
gnu/packages/patches/teckit-cstdio.patch \
|
||||||
gnu/packages/patches/texi2html-document-encoding.patch \
|
gnu/packages/patches/texi2html-document-encoding.patch \
|
||||||
|
gnu/packages/patches/texi2html-i18n.patch \
|
||||||
gnu/packages/patches/udev-gir-libtool.patch \
|
gnu/packages/patches/udev-gir-libtool.patch \
|
||||||
gnu/packages/patches/util-linux-perl.patch \
|
gnu/packages/patches/util-linux-perl.patch \
|
||||||
gnu/packages/patches/valgrind-glibc.patch \
|
gnu/packages/patches/valgrind-glibc.patch \
|
||||||
|
|
|
@ -0,0 +1,50 @@
|
||||||
|
Do not try to regenerate po files; use the reference files that are packaged
|
||||||
|
in the tarball.
|
||||||
|
|
||||||
|
--- a/Makefile.in 2010-06-30 17:02:28.000000000 -0500
|
||||||
|
+++ b/Makefile.in 2014-08-16 00:22:38.447050269 -0500
|
||||||
|
@@ -1022,15 +1022,7 @@
|
||||||
|
|
||||||
|
i18n/en.thl i18n/: $(po_document_dir)/po_document/$(PACKAGE)_document.pot
|
||||||
|
$(MKDIR_P) i18n
|
||||||
|
- if test '$(USE_NLS)' = 'yes'; then \
|
||||||
|
- for file in "$(srcdir)/$(po_document_dir)/po_document/"*".po"; do lang=`basename "$$file" .po | sed 's/\..*//'`; \
|
||||||
|
- test "$$lang" = 'en' && continue; \
|
||||||
|
- msgexec -i "$$file" "$(srcdir)/gettext_to_separated.pl" | "$(srcdir)/separated_to_hash.pl" $$lang > i18n/$$lang.thl; \
|
||||||
|
- done; \
|
||||||
|
- msgexec -i $< "$(srcdir)/gettext_to_separated.pl" | "$(srcdir)/separated_to_hash.pl" en > i18n/en.thl; \
|
||||||
|
- else \
|
||||||
|
- cp -p i18n_ref/*.thl i18n; \
|
||||||
|
- fi
|
||||||
|
+ cp -p i18n_ref/*.thl i18n
|
||||||
|
|
||||||
|
i18n_ref:
|
||||||
|
$(MKDIR_P) i18n_ref
|
||||||
|
|
||||||
|
Have install-sh install .mo files locally for in-source tests, so that msgfmt
|
||||||
|
is not needed.
|
||||||
|
|
||||||
|
--- a/Makefile.in 2010-06-30 17:02:28.000000000 -0500
|
||||||
|
+++ b/Makefile.in 2014-08-16 00:22:38.447050269 -0500
|
||||||
|
@@ -1052,19 +1044,8 @@
|
||||||
|
# update the po files, and install locally the .mo files for the in
|
||||||
|
# source tests
|
||||||
|
check-local: makeinfo.pl texi2any.pl
|
||||||
|
- if test '$(USE_NLS)' = 'yes'; then \
|
||||||
|
- cd $(po_document_dir)/po_document && $(MAKE) $(AM_MAKEFLAGS) update-po; \
|
||||||
|
- fi
|
||||||
|
- rm -rf locales
|
||||||
|
- for file in "$(srcdir)/$(po_document_dir)/po_document/"*.po; do \
|
||||||
|
- basename=`basename "$$file" .po` ; \
|
||||||
|
- $(MKDIR_P) "locales/$$basename/LC_MESSAGES/" ; \
|
||||||
|
- if test '$(USE_NLS)' = 'yes'; then \
|
||||||
|
- $(MSGFMT) "$$file" -o "locales/$$basename/LC_MESSAGES/texi2html_document.mo" ; \
|
||||||
|
- else \
|
||||||
|
- cp -p "$(srcdir)/$(po_document_dir)/po_document/$$basename.mo" "locales/$$basename/LC_MESSAGES/texi2html_document.mo" ; \
|
||||||
|
- fi; \
|
||||||
|
- done
|
||||||
|
+ $(MAKE) -C po_document localedir="$(abs_srcdir)/locales" install-data
|
||||||
|
+ $(MAKE) -C po_messages localedir="$(abs_srcdir)/locales" install-data
|
||||||
|
|
||||||
|
makeinfo.pl texi2any.pl:
|
||||||
|
-$(LN_S) $(srcdir)/texi2html.pl $@
|
|
@ -79,7 +79,8 @@ is on expressing the content semantically, avoiding physical markup commands.")
|
||||||
(base32
|
(base32
|
||||||
"1yprv64vrlcbksqv25asplnjg07mbq38lfclp1m5lj8cw878pag8"))
|
"1yprv64vrlcbksqv25asplnjg07mbq38lfclp1m5lj8cw878pag8"))
|
||||||
(patches
|
(patches
|
||||||
(list (search-patch "texi2html-document-encoding.patch")))
|
(list (search-patch "texi2html-document-encoding.patch")
|
||||||
|
(search-patch "texi2html-i18n.patch")))
|
||||||
(snippet
|
(snippet
|
||||||
;; This file is modified by the patch above, but reset its
|
;; This file is modified by the patch above, but reset its
|
||||||
;; timestamp so we don't trigger the rule to update PO files,
|
;; timestamp so we don't trigger the rule to update PO files,
|
||||||
|
|
Loading…
Reference in New Issue