Patch to handle

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@167 35c25a1d-7b9e-4130-9fde-d3aeb78583b8

diff --git a/ChangeLog b/ChangeLog
index afa06f539c3ae4bc37a98427e9296e0e0f677048..27e42a37388f72f5f4630e406283c08868a0208f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@ CVS code
 - nano.c:
   main()
        - Changed tabsize long arg to actually accept an argument *sigh*.
+- po/Makefile.in.in:
+       - Patch to handle $DESTDIR (orig by Dan Harnett contributed by
+         Christian Weisgerber)
 
 nano-0.9.15 - 08/03/2000
 - Changed edit_update call to take arguments TOP, CENTER or BOTTOM.

diff --git a/po/Makefile.in.in b/po/Makefile.in.in
index 111b40fcbb6664771b9f09c3cd91fff9dccffe75..3130eebb0137c53d1491edf27c778b7427a7182b 100644 (file)
--- a/po/Makefile.in.in
+++ b/po/Makefile.in.in
@@ -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,30 @@ 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 +156,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