Take DESTDIR into account in install/uninstall

This commit is contained in:
Ross Golder 2001-09-05 21:55:59 +00:00
parent e60a91344e
commit e7a624f94a
2 changed files with 15 additions and 11 deletions

View File

@ -1,3 +1,7 @@
2001-09-05 Ross Golder <rossg@golder.org>
* Makefile.in.in (install-data-yes): Take DESTDIR into account
Wed Sep 5 09:27:34 2001 Owen Taylor <otaylor@redhat.com> Wed Sep 5 09:27:34 2001 Owen Taylor <otaylor@redhat.com>
* Revert last change to Makefile.in.in - no this * Revert last change to Makefile.in.in - no this

View File

@ -115,9 +115,9 @@ install-data: install-data-@USE_NLS@
install-data-no: all install-data-no: all
install-data-yes: all install-data-yes: all
if test -r "$(MKINSTALLDIRS)"; then \ if test -r "$(MKINSTALLDIRS)"; then \
$(MKINSTALLDIRS) $(datadir); \ $(MKINSTALLDIRS) $(DESTDIR)$(datadir); \
else \ else \
$(SHELL) $(top_srcdir)/mkinstalldirs $(datadir); \ $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir); \
fi fi
@catalogs='$(CATALOGS)'; \ @catalogs='$(CATALOGS)'; \
for cat in $$catalogs; do \ for cat in $$catalogs; do \
@ -127,7 +127,7 @@ install-data-yes: all
*) destdir=$(localedir);; \ *) destdir=$(localedir);; \
esac; \ esac; \
lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \ lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
dir=$$destdir/$$lang/LC_MESSAGES; \ dir=$(DESTDIR)$$destdir/$$lang/LC_MESSAGES; \
if test -r "$(MKINSTALLDIRS)"; then \ if test -r "$(MKINSTALLDIRS)"; then \
$(MKINSTALLDIRS) $$dir; \ $(MKINSTALLDIRS) $$dir; \
else \ else \
@ -157,12 +157,12 @@ install-data-yes: all
done done
if test "$(GETTEXT_PACKAGE)" = "gettext"; then \ if test "$(GETTEXT_PACKAGE)" = "gettext"; then \
if test -r "$(MKINSTALLDIRS)"; then \ if test -r "$(MKINSTALLDIRS)"; then \
$(MKINSTALLDIRS) $(gettextsrcdir); \ $(MKINSTALLDIRS) $(DESTDIR)$(gettextsrcdir); \
else \ else \
$(SHELL) $(top_srcdir)/mkinstalldirs $(gettextsrcdir); \ $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(gettextsrcdir); \
fi; \ fi; \
$(INSTALL_DATA) $(srcdir)/Makefile.in.in \ $(INSTALL_DATA) $(srcdir)/Makefile.in.in \
$(gettextsrcdir)/Makefile.in.in; \ $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \
else \ else \
: ; \ : ; \
fi fi
@ -175,12 +175,12 @@ uninstall:
for cat in $$catalogs; do \ for cat in $$catalogs; do \
cat=`basename $$cat`; \ cat=`basename $$cat`; \
lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \ lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
rm -f $(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \ rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \
rm -f $(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \ rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \
rm -f $(gnulocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \ rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \
rm -f $(gnulocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \ rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \
done done
rm -f $(gettextsrcdir)/po-Makefile.in.in rm -f $(DESTDIR)$(gettextsrcdir)/po-Makefile.in.in
check: all check: all