From e50ab96561e4885744028d60e7f654c9406ac869 Mon Sep 17 00:00:00 2001 From: Yves Arrouye Date: Fri, 10 Mar 2000 22:55:19 +0000 Subject: [PATCH] ICU-314 added $(DESTDIR) to every directory used in an install command. X-SVN-Rev: 941 --- icu4c/source/Makefile.in | 8 ++++---- icu4c/source/common/Makefile.in | 10 +++++----- icu4c/source/extra/ustdio/Makefile.in | 10 +++++----- icu4c/source/i18n/Makefile.in | 10 +++++----- icu4c/source/tools/Makefile.in | 8 ++++---- icu4c/source/tools/genccode/Makefile.in | 4 ++-- icu4c/source/tools/gencmn/Makefile.in | 4 ++-- icu4c/source/tools/gencnval/Makefile.in | 4 ++-- icu4c/source/tools/gencol/Makefile.in | 8 ++++---- icu4c/source/tools/gennames/Makefile.in | 4 ++-- icu4c/source/tools/genprops/Makefile.in | 4 ++-- icu4c/source/tools/genrb/Makefile.in | 16 ++++++++-------- icu4c/source/tools/gentest/Makefile.in | 4 ++-- icu4c/source/tools/gentz/Makefile.in | 4 ++-- icu4c/source/tools/makeconv/Makefile.in | 10 +++++----- icu4c/source/tools/rbdump/Makefile.in | 4 ++-- icu4c/source/tools/toolutil/Makefile.in | 4 ++-- 17 files changed, 58 insertions(+), 58 deletions(-) diff --git a/icu4c/source/Makefile.in b/icu4c/source/Makefile.in index 52690f4440e..e6ef4495f82 100644 --- a/icu4c/source/Makefile.in +++ b/icu4c/source/Makefile.in @@ -100,11 +100,11 @@ all-local: $(srcdir)/configure builddata install-local: @for file in $(EXTRA_DATA); do \ - echo $(INSTALL_DATA) $(top_srcdir)/../data/$$file $(pkgdatadir)/$(VERSION)/$$file; \ - $(INSTALL_DATA) $(top_srcdir)/../data/$$file $(pkgdatadir)/$(VERSION)/$$file; \ + echo $(INSTALL_DATA) $(top_srcdir)/../data/$$file $(DESTDIR)$(pkgdatadir)/$(VERSION)/$$file; \ + $(INSTALL_DATA) $(top_srcdir)/../data/$$file $(DESTDIR)$(pkgdatadir)/$(VERSION)/$$file || exit; \ done - $(INSTALL_DATA) $(top_builddir)/config/Makefile $(pkgdatadir)/Makefile.inc - $(INSTALL_SCRIPT) $(top_srcdir)/mkinstalldirs $(sbindir)/mkinstalldirs + $(INSTALL_DATA) $(top_builddir)/config/Makefile $(DESTDIR)$(pkgdatadir)/Makefile.inc + $(INSTALL_SCRIPT) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(sbindir)/mkinstalldirs ## Generate HTML documentation doc: diff --git a/icu4c/source/common/Makefile.in b/icu4c/source/common/Makefile.in index 7596090fc39..1b1272b1882 100644 --- a/icu4c/source/common/Makefile.in +++ b/icu4c/source/common/Makefile.in @@ -103,14 +103,14 @@ all-local: $(TARGET) install-local: install-headers install-library install-library: all-local - $(mkinstalldirs) $(libdir) - $(INSTALL) $(TARGET) $(libdir)/$(TARGET) + $(mkinstalldirs) $(DESTDIR)$(libdir) + $(INSTALL) $(TARGET) $(DESTDIR)$(libdir)/$(TARGET) install-headers: - $(mkinstalldirs) $(includedir)/unicode + $(mkinstalldirs) $(DESTDIR)$(includedir)/unicode @for file in $(HEADERS); do \ - echo "$(INSTALL_DATA) $$file $(includedir)/unicode"; \ - $(INSTALL_DATA) $$file $(includedir)/unicode; \ + echo "$(INSTALL_DATA) $$file $(DESTDIR)$(includedir)/unicode"; \ + $(INSTALL_DATA) $$file $(DESTDIR)$(includedir)/unicode || exit; \ done dist-local: diff --git a/icu4c/source/extra/ustdio/Makefile.in b/icu4c/source/extra/ustdio/Makefile.in index 3fd58c79b1e..f5046fa365e 100644 --- a/icu4c/source/extra/ustdio/Makefile.in +++ b/icu4c/source/extra/ustdio/Makefile.in @@ -87,14 +87,14 @@ all-local: $(TARGET) install-local: all-local install-headers install-library install-library: all-local - $(mkinstalldirs) $(libdir) - $(INSTALL) $(TARGET) $(libdir)/$(TARGET) + $(mkinstalldirs) $(DESTDIR)$(libdir) + $(INSTALL) $(TARGET) $(DESTDIR)$(libdir)/$(TARGET) install-headers: - $(mkinstalldirs) $(includedir)/unicode + $(mkinstalldirs) $(DESTDIR)$(includedir)/unicode @for file in $(HEADERS); do \ - echo " $(INSTALL_DATA) $$file $(includedir)/unicode"; \ - $(INSTALL_DATA) $$file $(includedir)/unicode; \ + echo " $(INSTALL_DATA) $$file $(DESTDIR)$(includedir)/unicode"; \ + $(INSTALL_DATA) $$file $(DESTDIR)$(includedir)/unicode || exit; \ done diff --git a/icu4c/source/i18n/Makefile.in b/icu4c/source/i18n/Makefile.in index 019a39ed7f9..4a667f1bccc 100644 --- a/icu4c/source/i18n/Makefile.in +++ b/icu4c/source/i18n/Makefile.in @@ -89,14 +89,14 @@ all-local: $(TARGET) install-local: install-headers install-library install-library: all-local - $(mkinstalldirs) $(libdir) - $(INSTALL) $(TARGET) $(libdir)/$(TARGET) + $(mkinstalldirs) $(DESTDIR)$(libdir) + $(INSTALL) $(TARGET) $(DESTDIR)$(libdir)/$(TARGET) install-headers: - $(mkinstalldirs) $(includedir)/unicode + $(mkinstalldirs) $(DESTDIR)$(includedir)/unicode @for file in $(HEADERS); do \ - echo " $(INSTALL_DATA) $$file $(includedir)/unicode"; \ - $(INSTALL_DATA) $$file $(includedir)/unicode; \ + echo " $(INSTALL_DATA) $$file $(DESTDIR)$(includedir)/unicode"; \ + $(INSTALL_DATA) $$file $(DESTDIR)$(includedir)/unicode || exit; \ done dist-local: diff --git a/icu4c/source/tools/Makefile.in b/icu4c/source/tools/Makefile.in index 13e9d6c221e..950f570856e 100644 --- a/icu4c/source/tools/Makefile.in +++ b/icu4c/source/tools/Makefile.in @@ -245,14 +245,14 @@ install-everything: install-files install-dlls install-files: @for file in $(UDATA_FILES); do \ - echo $(INSTALL_DATA) $(top_builddir)/data/$$file $(pkgdatadir)/$(VERSION)/$$file; \ - $(INSTALL_DATA) $(top_builddir)/data/$$file $(pkgdatadir)/$(VERSION)/$$file; \ + echo $(INSTALL_DATA) $(top_builddir)/data/$$file $(DESTDIR)$(pkgdatadir)/$(VERSION)/$$file; \ + $(INSTALL_DATA) $(top_builddir)/data/$$file $(DESTDIR)$(pkgdatadir)/$(VERSION)/$$file || exit; \ done install-dlls: @for file in $(UDATA_DLLS); do \ - echo $(INSTALL_DATA) $(top_builddir)/data/$$file $(pkgdatadir)/$(VERSION)/$$file; \ - $(INSTALL_DATA) $(top_builddir)/data/$$file $(pkgdatadir)/$(VERSION)/$$file; \ + echo $(INSTALL_DATA) $(top_builddir)/data/$$file $(DESTDIR)$(pkgdatadir)/$(VERSION)/$$file; \ + $(INSTALL_DATA) $(top_builddir)/data/$$file $(DESTDIR)$(pkgdatadir)/$(VERSION)/$$file || exit; \ done diff --git a/icu4c/source/tools/genccode/Makefile.in b/icu4c/source/tools/genccode/Makefile.in index 52d0d635214..1d3bf48388d 100644 --- a/icu4c/source/tools/genccode/Makefile.in +++ b/icu4c/source/tools/genccode/Makefile.in @@ -80,8 +80,8 @@ check: check-local all-local: $(TARGET) $(RES_FILES) $(TRANSLIT_RES) $(TEST_FILES) install-local: all-local - $(mkinstalldirs) $(sbindir) - $(INSTALL) $(TARGET) $(sbindir)/$(TARGET) + $(mkinstalldirs) $(DESTDIR)$(sbindir) + $(INSTALL) $(TARGET) $(DESTDIR)$(sbindir)/$(TARGET) dist-local: diff --git a/icu4c/source/tools/gencmn/Makefile.in b/icu4c/source/tools/gencmn/Makefile.in index 72cdb79a154..62bb14d8415 100644 --- a/icu4c/source/tools/gencmn/Makefile.in +++ b/icu4c/source/tools/gencmn/Makefile.in @@ -80,8 +80,8 @@ check: check-local all-local: $(TARGET) $(RES_FILES) $(TRANSLIT_RES) $(TEST_FILES) install-local: all-local - $(mkinstalldirs) $(sbindir) - $(INSTALL) $(TARGET) $(sbindir)/$(TARGET) + $(mkinstalldirs) $(DESTDIR)$(sbindir) + $(INSTALL) $(TARGET) $(DESTDIR)$(sbindir)/$(TARGET) dist-local: diff --git a/icu4c/source/tools/gencnval/Makefile.in b/icu4c/source/tools/gencnval/Makefile.in index d0f028ed1a7..c48100b124e 100644 --- a/icu4c/source/tools/gencnval/Makefile.in +++ b/icu4c/source/tools/gencnval/Makefile.in @@ -84,8 +84,8 @@ check: check-local all-local: $(TARGET) build-data install-local: all-local build-data - $(mkinstalldirs) $(sbindir) - $(INSTALL) $(TARGET) $(sbindir)/$(TARGET) + $(mkinstalldirs) $(DESTDIR)$(sbindir) + $(INSTALL) $(TARGET) $(DESTDIR)$(sbindir)/$(TARGET) build-data: $(ICUDATADIR)/cnvalias.dat diff --git a/icu4c/source/tools/gencol/Makefile.in b/icu4c/source/tools/gencol/Makefile.in index 76b72ec93c6..62bd614f5fa 100644 --- a/icu4c/source/tools/gencol/Makefile.in +++ b/icu4c/source/tools/gencol/Makefile.in @@ -91,10 +91,10 @@ clean-sentinel: rm -f .sentinel install-local: all-local -# $(mkinstalldirs) $(sbindir) -# $(INSTALL) $(TARGET) $(sbindir)/$(TARGET) - $(mkinstalldirs) $(pkgdatadir)/$(VERSION) - cp @DATABUILDDIR@/*.col $(pkgdatadir)/$(VERSION) +# $(mkinstalldirs) $(DESTDIR)$(sbindir) +# $(INSTALL) $(TARGET) $(DESTDIR)$(sbindir)/$(TARGET) + $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/$(VERSION) + cp @DATABUILDDIR@/*.col $(DESTDIR)$(pkgdatadir)/$(VERSION) dist-local: diff --git a/icu4c/source/tools/gennames/Makefile.in b/icu4c/source/tools/gennames/Makefile.in index c492464364b..df1cb8ec525 100644 --- a/icu4c/source/tools/gennames/Makefile.in +++ b/icu4c/source/tools/gennames/Makefile.in @@ -85,8 +85,8 @@ check: check-local all-local: $(TARGET) build-data install-local: all-local build-data - $(mkinstalldirs) $(sbindir) - $(INSTALL) $(TARGET) $(sbindir)/$(TARGET) + $(mkinstalldirs) $(DESTDIR)$(sbindir) + $(INSTALL) $(TARGET) $(DESTDIR)$(sbindir)/$(TARGET) build-data: $(ICUDATADIR)/unames.dat diff --git a/icu4c/source/tools/genprops/Makefile.in b/icu4c/source/tools/genprops/Makefile.in index f3a92446385..744cec8f738 100644 --- a/icu4c/source/tools/genprops/Makefile.in +++ b/icu4c/source/tools/genprops/Makefile.in @@ -85,8 +85,8 @@ check: check-local all-local: $(TARGET) build-data install-local: all-local build-data - $(mkinstalldirs) $(sbindir) - $(INSTALL) $(TARGET) $(sbindir)/$(TARGET) + $(mkinstalldirs) $(DESTDIR)$(sbindir) + $(INSTALL) $(DESTDIR)$(TARGET) $(sbindir)/$(TARGET) build-data: $(ICUDATADIR)/unames.dat diff --git a/icu4c/source/tools/genrb/Makefile.in b/icu4c/source/tools/genrb/Makefile.in index dbae36c0ac0..eedf42d81cc 100644 --- a/icu4c/source/tools/genrb/Makefile.in +++ b/icu4c/source/tools/genrb/Makefile.in @@ -115,17 +115,17 @@ check: check-local all-local: $(TARGET) $(RES_FILES) $(TRANSLIT_RES) $(TEST_FILES) install-local: all-local - $(mkinstalldirs) $(sbindir) - $(INSTALL) $(TARGET) $(sbindir)/$(TARGET) - $(mkinstalldirs) $(pkgdatadir)/$(VERSION) + $(mkinstalldirs) $(DESTDIR)$(sbindir) + $(INSTALL) $(TARGET) $(DESTDIR)$(sbindir)/$(TARGET) + $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/$(VERSION) @list='$(notdir $(RES_FILES))'; for file in $$list; do \ - echo $(INSTALL_DATA) $(top_builddir)/data/$$file $(pkgdatadir)/$(VERSION)/$$file; \ - $(INSTALL_DATA) $(top_builddir)/data/$$file $(pkgdatadir)/$(VERSION)/$$file; \ + echo $(INSTALL_DATA) $(top_builddir)/data/$$file $(DESTDIR)$(pkgdatadir)/$(VERSION)/$$file; \ + $(INSTALL_DATA) $(top_builddir)/data/$$file $(DESTDIR)$(pkgdatadir)/$(VERSION)/$$file; \ done - $(mkinstalldirs) $(pkgdatadir)/$(VERSION)/translit + $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/$(VERSION)/translit @list='$(notdir $(TRANSLIT_RES))'; for file in $$list; do \ - echo $(INSTALL_DATA) $(top_builddir)/data/translit/$$file $(pkgdatadir)/$(VERSION)/translit/$$file; \ - $(INSTALL_DATA) $(top_builddir)/data/translit/$$file $(pkgdatadir)/$(VERSION)/translit/$$file; \ + echo $(INSTALL_DATA) $(top_builddir)/data/translit/$$file $(DESTDIR)$(pkgdatadir)/$(VERSION)/translit/$$file; \ + $(INSTALL_DATA) $(top_builddir)/data/translit/$$file $(DESTDIR)$(pkgdatadir)/$(VERSION)/translit/$$file; \ done dist-local: diff --git a/icu4c/source/tools/gentest/Makefile.in b/icu4c/source/tools/gentest/Makefile.in index e7efa9c8a10..15d6808c08c 100644 --- a/icu4c/source/tools/gentest/Makefile.in +++ b/icu4c/source/tools/gentest/Makefile.in @@ -86,8 +86,8 @@ check: check-local all-local: $(TARGET) build-data install-local: all-local build-data - $(mkinstalldirs) $(sbindir) - $(INSTALL) $(TARGET) $(sbindir)/$(TARGET) + $(mkinstalldirs) $(DESTDIR)$(sbindir) + $(INSTALL) $(TARGET) $(DESTDIR)$(sbindir)/$(TARGET) build-data: $(ICUDATADIR)/test.dat diff --git a/icu4c/source/tools/gentz/Makefile.in b/icu4c/source/tools/gentz/Makefile.in index 06e2f57362b..c919e973a1e 100644 --- a/icu4c/source/tools/gentz/Makefile.in +++ b/icu4c/source/tools/gentz/Makefile.in @@ -85,8 +85,8 @@ check: check-local all-local: $(TARGET) build-data install-local: all-local build-data - $(mkinstalldirs) $(sbindir) - $(INSTALL) $(TARGET) $(sbindir)/$(TARGET) + $(mkinstalldirs) $(DESTDIR)$(sbindir) + $(INSTALL) $(TARGET) $(DESTDIR)$(sbindir)/$(TARGET) build-data: $(ICUDATADIR)/tz.dat diff --git a/icu4c/source/tools/makeconv/Makefile.in b/icu4c/source/tools/makeconv/Makefile.in index af358a65af0..d0ce15998e4 100644 --- a/icu4c/source/tools/makeconv/Makefile.in +++ b/icu4c/source/tools/makeconv/Makefile.in @@ -86,12 +86,12 @@ all-local: $(TARGET) $(CNV_FILES) install-local: all-local - $(mkinstalldirs) $(sbindir) - $(INSTALL) $(TARGET) $(sbindir)/$(TARGET) -# $(mkinstalldirs) $(pkgdatadir)/$(VERSION) + $(mkinstalldirs) $(DESTDIR)$(sbindir) + $(INSTALL) $(TARGET) $(DESTDIR)$(sbindir)/$(TARGET) +# $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/$(VERSION) # @list='$(notdir $(CNV_FILES)) convrtrs.txt'; for file in $$list; do \ -# echo $(INSTALL_DATA) $(top_builddir)/data/$$file $(pkgdatadir)/$(VERSION)/$$file; \ -# $(INSTALL_DATA) $(top_builddir)/data/$$file $(pkgdatadir)/$(VERSION)/$$file; \ +# echo $(INSTALL_DATA) $(top_builddir)/data/$$file $(DESTDIR)$(pkgdatadir)/$(VERSION)/$$file; \ +# $(INSTALL_DATA) $(top_builddir)/data/$$file $(DESTDIR)$(pkgdatadir)/$(VERSION)/$$file; \ # done dist-local: diff --git a/icu4c/source/tools/rbdump/Makefile.in b/icu4c/source/tools/rbdump/Makefile.in index 79b6382887e..f68c7d7f37e 100644 --- a/icu4c/source/tools/rbdump/Makefile.in +++ b/icu4c/source/tools/rbdump/Makefile.in @@ -76,8 +76,8 @@ check: check-local all-local: $(TARGET) install-local: all-local - $(mkinstalldirs) $(sbindir) - $(INSTALL) $(TARGET) $(sbindir)/$(TARGET) + $(mkinstalldirs) $(DESTDIR)$(sbindir) + $(INSTALL) $(TARGET) $(DESTDIR)$(sbindir)/$(TARGET) dist-local: diff --git a/icu4c/source/tools/toolutil/Makefile.in b/icu4c/source/tools/toolutil/Makefile.in index faf089787ef..4cba1731148 100644 --- a/icu4c/source/tools/toolutil/Makefile.in +++ b/icu4c/source/tools/toolutil/Makefile.in @@ -77,8 +77,8 @@ all-local: $(TARGET) install-local: install-library install-library: all-local - $(mkinstalldirs) $(libdir) - $(INSTALL) $(TARGET) $(libdir)/$(TARGET) + $(mkinstalldirs) $(DESTDIR)$(libdir) + $(INSTALL) $(TARGET) $(DESTDIR)$(libdir)/$(TARGET) dist-local: