Re: po/Makefile.in.in patch for DESTDIR support

[Owen Taylor <otaylor redhat com>]

Ross Golder <ross golder org> writes:

> This patch is needed for doing a 'make DESTDIR=/tmp/testglib install'.
> Should I commit?

Hmm, looking back, what I should have said in my other mail
is ask firs there and then _wait for a response_ before committing.

This patch, as opposed to what you committed, looks fine. 

However, note:

 - glib/po/Makefile.in.in and gtk+/po/Makefile need to be kept
   strictly in sync.

 - For completeness, the uninstall target should be fixed for
   DESTDIR as well.

Regards,
                                        Owen
 
 
> Index: po/Makefile.in.in
> ===================================================================
> RCS file: /cvs/gnome/glib/po/Makefile.in.in,v
> retrieving revision 1.1
> diff -u -r1.1 Makefile.in.in
> --- po/Makefile.in.in	2001/01/16 02:24:24	1.1
> +++ po/Makefile.in.in	2001/09/02 10:42:06
> @@ -115,9 +115,9 @@
>  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 \
> @@ -127,7 +127,7 @@
>  	    *)     destdir=$(localedir);; \
>  	  esac; \
>  	  lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
> -	  dir=$$destdir/$$lang/LC_MESSAGES; \
> +	  dir=$(DESTDIR)$$destdir/$$lang/LC_MESSAGES; \
>  	  if test -r "$(MKINSTALLDIRS)"; then \
>  	    $(MKINSTALLDIRS) $$dir; \
>  	  else \
S