[patch] gettext-0.10.40 installs files in the wrong directories

[Adrian Bunk]

Hi,

while building programs on NetBSD I saw several programs install their .mo
files under directories /usr/local/share/locale/*.mo (the ".mo" is wrong).
The following patch against gettext-0.10.40 fixes this:


--- po/Makefile.in.in.old       Sun Oct  7 22:58:26 2001
+++ po/Makefile.in.in   Sun Oct  7 22:59:12 2001
@@ -106,7 +106,7 @@
        @catalogs='$(CATALOGS)'; \
        for cat in $$catalogs; do \
          cat=`basename $$cat`; \
-         lang=`echo $$cat | sed 's/\.gmo$$//'`; \
+         lang=`echo $$cat | sed 's/\.gmo$$//' | sed 's/\.mo$$//'`; \
          dir=$(localedir)/$$lang/LC_MESSAGES; \
          $(mkinstalldirs) $(DESTDIR)$$dir; \
          if test -r $$cat; then \
@@ -126,7 +126,7 @@
        catalogs='$(CATALOGS)'; \
        for cat in $$catalogs; do \
          cat=`basename $$cat`; \
-         lang=`echo $$cat | sed 's/\.gmo$$//'`; \
+         lang=`echo $$cat | sed 's/\.gmo$$//' | sed 's/\.mo$$//'`; \
          rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(PACKAGE).mo; \
        done
        if test "$(PACKAGE)" = "gettext"; then \
@@ -172,7 +172,7 @@
        catalogs='$(GMOFILES)'; \
        for cat in $$catalogs; do \
          cat=`basename $$cat`; \
-         lang=`echo $$cat | sed 's/\.gmo$$//'`; \
+         lang=`echo $$cat | sed 's/\.gmo$$//' | sed 's/\.mo$$//'`; \
          echo "$$lang:"; \
          if $(MSGMERGE) $$lang.po $(PACKAGE).pot -o $$lang.new.po; then \
            mv -f $$lang.new.po $$lang.po; \


cu
Adrian

-- 

Get my GPG key: finger address@hidden | gpg --import

Fingerprint: B29C E71E FE19 6755 5C8A  84D4 99FC EA98 4F12 B400