Take DESTDIR into account in install/uninstall
This commit is contained in:
		@ -1,3 +1,7 @@
 | 
			
		||||
2001-09-05  Ross Golder  <rossg@golder.org>
 | 
			
		||||
 | 
			
		||||
	* Makefile.in.in (install-data-yes): Take DESTDIR into account
 | 
			
		||||
 | 
			
		||||
2001-09-05  Pablo Saratxaga  <pablo@mandrakesoft.com>
 | 
			
		||||
 | 
			
		||||
	* es.po: Updated Spanish file
 | 
			
		||||
 | 
			
		||||
@ -115,9 +115,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 \
 | 
			
		||||
@ -127,7 +127,7 @@ install-data-yes: all
 | 
			
		||||
	    *)     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 \
 | 
			
		||||
@ -157,12 +157,12 @@ install-data-yes: all
 | 
			
		||||
	done
 | 
			
		||||
	if test "$(GETTEXT_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
 | 
			
		||||
@ -175,12 +175,12 @@ uninstall:
 | 
			
		||||
	for cat in $$catalogs; do \
 | 
			
		||||
	  cat=`basename $$cat`; \
 | 
			
		||||
	  lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
 | 
			
		||||
	  rm -f $(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \
 | 
			
		||||
	  rm -f $(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \
 | 
			
		||||
	  rm -f $(gnulocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \
 | 
			
		||||
	  rm -f $(gnulocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \
 | 
			
		||||
	  rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \
 | 
			
		||||
	  rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \
 | 
			
		||||
	  rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \
 | 
			
		||||
	  rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \
 | 
			
		||||
	done
 | 
			
		||||
	rm -f $(gettextsrcdir)/po-Makefile.in.in
 | 
			
		||||
	rm -f $(DESTDIR)$(gettextsrcdir)/po-Makefile.in.in
 | 
			
		||||
 | 
			
		||||
check: all
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
		Reference in New Issue
	
	Block a user