Support for DESTDIR.

diff --git a/po/ChangeLog b/po/ChangeLog
index 5793805b36857d76eda03b964d9ca273407fd2f7..6a4c6bd9464399df0b8aab1fa9157fa96b24d19c 100644 (file)
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,9 @@
+2000-07-26  Bruno Haible  <haible@clisp.cons.org>
+
+       * Makefile.in.in (install, uninstall): Provide DESTDIR support, as
+       recommended by GNU standards.
+       (uninstall): Remove obsolete po-Makefile.in.in line.
+
 2000-05-06  Ulrich Drepper  <drepper@redhat.com>
 
        * Makefile.in.in: Handle case where generation of $(PACKAGE).po fails.

diff --git a/po/Makefile.in.in b/po/Makefile.in.in
index f470f335b45860d2cecb420f2cb97ab187b1db53..33e1db245087edaec2189ad1d04caf69c3818006 100644 (file)
--- a/po/Makefile.in.in
+++ b/po/Makefile.in.in
@@ -1,5 +1,5 @@
 # Makefile for program source directory in GNU NLS utilities package.
-# Copyright (C) 1995, 1996, 1997 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
+# Copyright (C) 1995, 1996, 1997, 2000 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
 #
 # This file file be copied and used freely without restrictions.  It can
 # be used in projects which are not available under the GNU Public License
@@ -111,9 +111,9 @@ install-data: install-data-@USE_NLS@
 install-data-no: all
 install-data-yes: all
        if test -r "$(MKINSTALLDIRS)"; then \
-         $(MKINSTALLDIRS) $(datadir); \
+         $(MKINSTALLDIRS) $(DESTDIR)$(datadir); \
        else \
-         $(SHELL) $(top_srcdir)/mkinstalldirs $(datadir); \
+         $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir); \
        fi
        @catalogs='$(CATALOGS)'; \
        for cat in $$catalogs; do \
@@ -125,27 +125,29 @@ install-data-yes: all
          lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
          dir=$$destdir/$$lang/LC_MESSAGES; \
          if test -r "$(MKINSTALLDIRS)"; then \
-           $(MKINSTALLDIRS) $$dir; \
+           $(MKINSTALLDIRS) $(DESTDIR)$$dir; \
          else \
-           $(SHELL) $(top_srcdir)/mkinstalldirs $$dir; \
+           $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$$dir; \
          fi; \
          if test -r $$cat; then \
-           $(INSTALL_DATA) $$cat $$dir/$(PACKAGE)$(INSTOBJEXT); \
-           echo "installing $$cat as $$dir/$(PACKAGE)$(INSTOBJEXT)"; \
+           $(INSTALL_DATA) $$cat $(DESTDIR)$$dir/$(PACKAGE)$(INSTOBJEXT); \
+           echo "installing $$cat as" \
+                "$(DESTDIR)$$dir/$(PACKAGE)$(INSTOBJEXT)"; \
          else \
-           $(INSTALL_DATA) $(srcdir)/$$cat $$dir/$(PACKAGE)$(INSTOBJEXT); \
+           $(INSTALL_DATA) $(srcdir)/$$cat $(DESTDIR)$$dir/$(PACKAGE)$(INSTOBJEXT); \
            echo "installing $(srcdir)/$$cat as" \
-                "$$dir/$(PACKAGE)$(INSTOBJEXT)"; \
+                "$(DESTDIR)$$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"; \
+           $(INSTALL_DATA) $$cat.m $(DESTDIR)$$dir/$(PACKAGE)$(INSTOBJEXT).m; \
+           echo "installing $$cat.m as" \
+                "$(DESTDIR)$$dir/$(PACKAGE)$(INSTOBJEXT).m"; \
          else \
            if test -r $(srcdir)/$$cat.m ; then \
              $(INSTALL_DATA) $(srcdir)/$$cat.m \
-               $$dir/$(PACKAGE)$(INSTOBJEXT).m; \
+               $(DESTDIR)$$dir/$(PACKAGE)$(INSTOBJEXT).m; \
              echo "installing $(srcdir)/$$cat as" \
-                  "$$dir/$(PACKAGE)$(INSTOBJEXT).m"; \
+                  "$(DESTDIR)$$dir/$(PACKAGE)$(INSTOBJEXT).m"; \
            else \
              true; \
            fi; \
@@ -153,12 +155,12 @@ install-data-yes: all
        done
        if test "$(PACKAGE)" = "gettext"; then \
          if test -r "$(MKINSTALLDIRS)"; then \
-           $(MKINSTALLDIRS) $(gettextsrcdir); \
+           $(MKINSTALLDIRS) $(DESTDIR)$(gettextsrcdir); \
          else \
-           $(SHELL) $(top_srcdir)/mkinstalldirs $(gettextsrcdir); \
+           $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(gettextsrcdir); \
          fi; \
          $(INSTALL_DATA) $(srcdir)/Makefile.in.in \
-                         $(gettextsrcdir)/Makefile.in.in; \
+                         $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \
        else \
          : ; \
        fi
@@ -171,12 +173,11 @@ uninstall:
        for cat in $$catalogs; do \
          cat=`basename $$cat`; \
          lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
-         rm -f $(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
-         rm -f $(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \
-         rm -f $(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
-         rm -f $(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \
+         rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
+         rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \
+         rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
+         rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \
        done
-       rm -f $(gettextsrcdir)/po-Makefile.in.in
 
 check: all