($(PACKAGE).pot): Merge from gettext-0.10.23.

diff --git a/po/Makefile.in.in b/po/Makefile.in.in
index 95db1a257aa754953476312271f8efb6856d3a49..011dcf708b3c71fa27a8781ab7548526dd3a5f1a 100644 (file)
--- a/po/Makefile.in.in
+++ b/po/Makefile.in.in
@@ -35,6 +35,7 @@ subdir = po
 
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
+MKINSTALLDIRS = @MKINSTALLDIRS@
 
 CC = @CC@
 GENCAT = @GENCAT@
@@ -120,8 +121,12 @@ stamp-cat-id: $(PACKAGE).pot
 install: install-exec install-data
 install-exec:
 install-data: all
-       $(top_srcdir)/mkinstalldirs $(datadir)
-       catalogs='$(CATALOGS)'; \
+       if test -r $(MKINSTALLDIRS); then \
+         $(MKINSTALLDIRS) $(datadir); \
+       else \
+         $(top-srcdir)/mkinstalldirs $(datadir); \
+       fi
+       @catalogs='$(CATALOGS)'; \
        for cat in $$catalogs; do \
          case "$$cat" in \
            *.gmo) destdir=$(gnulocaledir);; \
@@ -129,29 +134,43 @@ install-data: all
          esac; \
          lang=`echo $$cat | sed 's/$(CATOBJEXT)$$//'`; \
          dir=$$destdir/$$lang/LC_MESSAGES; \
-         $(top_srcdir)/mkinstalldirs $$dir; \
+         if test -r $(MKINSTALLDIRS); then \
+           $(MKINSTALLDIRS) $$dir; \
+         else \
+           $(top-srcdir)/mkinstalldirs $$dir; \
+         fi; \
          if test -r $$cat; then \
            $(INSTALL_DATA) $$cat $$dir/$(PACKAGE)$(INSTOBJEXT); \
+           echo "installing $$cat as $$dir/$(PACKAGE)$(INSTOBJEXT)"; \
          else \
            $(INSTALL_DATA) $(srcdir)/$$cat $$dir/$(PACKAGE)$(INSTOBJEXT); \
+           echo "installing $(srcdir)/$$cat as" \
+                "$$dir/$(PACKAGE)$(INSTOBJEXT)"; \
          fi; \
          if test -r $$cat.m; then \
            $(INSTALL_DATA) $$cat.m $$dir/$(PACKAGE)$(INSTOBJEXT).m; \
+           echo "installing $$cat.m as $$dir/$(PACKAGE)$(INSTOBJEXT).m"; \
          else \
            if test -r $(srcdir)/$$cat.m ; then \
              $(INSTALL_DATA) $(srcdir)/$$cat.m \
                $$dir/$(PACKAGE)$(INSTOBJEXT).m; \
+             echo "installing $(srcdir)/$$cat as" \
+                  "$$dir/$(PACKAGE)$(INSTOBJEXT).m"; \
            else \
              true; \
            fi; \
          fi; \
        done
        if test "$(PACKAGE)" = "gettext"; then \
-         $(top_srcdir)/mkinstalldirs $(gettextsrcdir); \
+         if test -r $(MKINSTALLDIRS); then \
+           $(MKINSTALLDIRS) $(gettextsrcdir); \
+         else \
+           $(top_srcdir)/mkinstalldirs $(gettextsrcdir); \
+         fi; \
          cd $(srcdir) && \
            $(INSTALL_DATA) Makefile.in.in $(gettextsrcdir)/Makefile.in.in; \
        else \
-         true; \
+         : ; \
        fi
 
 # Define this as empty until I found a useful application.