55 lines
1.9 KiB
Diff
55 lines
1.9 KiB
Diff
diff --git a/INSTALL b/INSTALL
|
|
index e91f1ea2..f81f5772 100644
|
|
--- a/INSTALL
|
|
+++ b/INSTALL
|
|
@@ -33,7 +33,7 @@ documentation; ronn is required.
|
|
|
|
Additionally, other usual "core utilities" are required:
|
|
|
|
- cat, chmod, cp, echo, false, find, install, ln, msguniq, rm, tr,
|
|
+ cat, chmod, cp, echo, false, find, install, ln, rm, tr,
|
|
xgettext
|
|
|
|
Also, `/bin/sh` must support `{brace,expansion}`. If it doesn't, find
|
|
diff --git a/Makefile b/Makefile
|
|
index e7b35e41..c656a88d 100644
|
|
--- a/Makefile
|
|
+++ b/Makefile
|
|
@@ -41,7 +41,7 @@ $(outdir)/shellcheck:
|
|
|
|
_po_rule = \
|
|
po/%(pkg).pot: $(addsuffix /everything.pot,$(pkg.%(pkg))); \
|
|
- cat $^ | msguniq -Fi --to-code=UTF-8 > '$@'
|
|
+ cat $^
|
|
$(eval $(foreach pkg,$(pkgs),\
|
|
$(subst %(pkg),$(pkg),$(value _po_rule))$(at.nl)))
|
|
|
|
diff --git a/build-aux/Makefile.once.head/00-libretools.mk b/build-aux/Makefile.once.head/00-libretools.mk
|
|
index 1f2957d2..38813112 100644
|
|
--- a/build-aux/Makefile.once.head/00-libretools.mk
|
|
+++ b/build-aux/Makefile.once.head/00-libretools.mk
|
|
@@ -92,10 +92,6 @@ libretools.edit = sed \
|
|
-e 's|m4_include(lib/\(.*\))|. "$$(librelib \1)"|' \
|
|
$(foreach v,$(patsubst $(var.)%,%,$(filter $(var.)%,$^)), -e 's|@$(v)@|$($(v))|g' )
|
|
|
|
-# Usage <INPUT $(libretools.pofmt) >OUTPUT
|
|
-# Normalize a .po(t) file
|
|
-libretools.pofmt = msguniq -Fi --to-code=UTF-8
|
|
-
|
|
# Auto-detect ########################################################
|
|
|
|
# It's easy to think of these as "each" variables, but because they
|
|
diff --git a/src/lib/librexgettext b/src/lib/librexgettext
|
|
index a4f2eb99..8b008764 100755
|
|
--- a/src/lib/librexgettext
|
|
+++ b/src/lib/librexgettext
|
|
@@ -220,7 +220,7 @@ main() {
|
|
xgettext-sh "${simple[@]}" -- "${files[@]}"
|
|
xgettext-sh "${prose[@]}" -- "${files[@]}" | whitespace-collapse
|
|
xgettext-flag -- "${files[@]}"
|
|
- } | sed '/^\#, sh-format/d' | msguniq -Fi --to-code=UTF-8
|
|
+ } | sed '/^\#, sh-format/d'
|
|
}
|
|
|
|
main "$@"
|