diff -pu po.orig/Makefile.in.in po/Makefile.in.in --- po.orig/Makefile.in.in 2002-03-26 14:38:46.001000000 +0000 +++ po/Makefile.in.in 2007-10-04 22:31:11.260792100 +0100 @@ -110,10 +110,15 @@ install-exec: install-data: install-data-@USE_NLS@ install-data-no: all install-data-yes: all + if test -n "$(DESTDIR)" ; then \ + DDSLASH="$(DESTDIR)/" ; \ + else \ + DDSLASH="" ; \ + fi if test -r "$(MKINSTALLDIRS)"; then \ - $(MKINSTALLDIRS) $(DESTDIR)/$(datadir); \ + $(MKINSTALLDIRS) $$DDSLASH$(datadir); \ else \ - $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)/$(datadir); \ + $(SHELL) $(top_srcdir)/mkinstalldirs $$DDSLASH$(datadir); \ fi @catalogs='$(CATALOGS)'; \ for cat in $$catalogs; do \ @@ -125,27 +130,27 @@ install-data-yes: all lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \ dir=$$destdir/$$lang/LC_MESSAGES; \ if test -r "$(MKINSTALLDIRS)"; then \ - $(MKINSTALLDIRS) $(DESTDIR)/$$dir; \ + $(MKINSTALLDIRS) $$DDSLASH$$dir; \ else \ - $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)/$$dir; \ + $(SHELL) $(top_srcdir)/mkinstalldirs $$DDSLASH$$dir; \ fi; \ if test -r $$cat; then \ - $(INSTALL_DATA) $$cat $(DESTDIR)/$$dir/$(PACKAGE)$(INSTOBJEXT); \ - echo "installing $$cat as $(DESTDIR)/$$dir/$(PACKAGE)$(INSTOBJEXT)"; \ + $(INSTALL_DATA) $$cat $$DDSLASH$$dir/$(PACKAGE)$(INSTOBJEXT); \ + echo "installing $$cat as $$DDSLASH$$dir/$(PACKAGE)$(INSTOBJEXT)"; \ else \ - $(INSTALL_DATA) $(srcdir)/$$cat $(DESTDIR)/$$dir/$(PACKAGE)$(INSTOBJEXT); \ + $(INSTALL_DATA) $(srcdir)/$$cat $$DDSLASH$$dir/$(PACKAGE)$(INSTOBJEXT); \ echo "installing $(srcdir)/$$cat as" \ "$$dir/$(PACKAGE)$(INSTOBJEXT)"; \ fi; \ if test -r $$cat.m; then \ - $(INSTALL_DATA) $$cat.m $(DESTDIR)/$$dir/$(PACKAGE)$(INSTOBJEXT).m; \ - echo "installing $$cat.m as $(DESTDIR)/$$dir/$(PACKAGE)$(INSTOBJEXT).m"; \ + $(INSTALL_DATA) $$cat.m $$DDSLASH$$dir/$(PACKAGE)$(INSTOBJEXT).m; \ + echo "installing $$cat.m as $$DDSLASH$$dir/$(PACKAGE)$(INSTOBJEXT).m"; \ else \ if test -r $(srcdir)/$$cat.m ; then \ $(INSTALL_DATA) $(srcdir)/$$cat.m \ - $(DESTDIR)/$$dir/$(PACKAGE)$(INSTOBJEXT).m; \ + $$DDSLASH$$dir/$(PACKAGE)$(INSTOBJEXT).m; \ echo "installing $(srcdir)/$$cat as" \ - "$(DESTDIR)/$$dir/$(PACKAGE)$(INSTOBJEXT).m"; \ + "$$DDSLASH$$dir/$(PACKAGE)$(INSTOBJEXT).m"; \ else \ true; \ fi; \ @@ -153,12 +158,12 @@ install-data-yes: all done if test "$(PACKAGE)" = "gettext"; then \ if test -r "$(MKINSTALLDIRS)"; then \ - $(MKINSTALLDIRS) $(DESTDIR)/$(gettextsrcdir); \ + $(MKINSTALLDIRS) $$DDSLASH$(gettextsrcdir); \ else \ - $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)/$(gettextsrcdir); \ + $(SHELL) $(top_srcdir)/mkinstalldirs $$DDSLASH$(gettextsrcdir); \ fi; \ $(INSTALL_DATA) $(srcdir)/Makefile.in.in \ - $(DESTDIR)/$(gettextsrcdir)/Makefile.in.in; \ + $$DDSLASH$(gettextsrcdir)/Makefile.in.in; \ else \ : ; \ fi