From 71aad3b8e13b0892e680eefa225e54b97c34e7b8 Mon Sep 17 00:00:00 2001 From: aj Date: Thu, 9 Jan 2003 08:08:30 +0000 Subject: libf2c: 2003-01-09 Christian Cornelssen * Makefile.in (FLAGS_TO_PASS): Also pass DESTDIR. (install, uninstall): Prepend $(DESTDIR) to destination paths in all (un)installation commands. libiberty: 2003-01-09 Christian Cornelssen * Makefile.in (FLAGS_TO_PASS): Also pass DESTDIR. libobjc: 2003-01-09 Christian Cornelssen * Makefile.in (FLAGS_TO_PASS): Also pass DESTDIR. (install-libs, install-headers): Prepend $(DESTDIR) to destination paths in all (un)installation commands. libstdc++: 2003-01-09 Christian Cornelssen * include/Makefile.am (install-data-local): Prepend $(DESTDIR) to destination paths in all (un)installation commands. Use ${c_base_builddir} and ${std_builddir} as destination subdirectories to achieve consistency with preceding mkinstalldirs commands. No effect because both variables contain "." only. * include/Makefile.in: Regenerate. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@61082 138bc75d-0d04-0410-961f-82ee72b054a4 --- libf2c/ChangeLog | 6 ++++++ libf2c/Makefile.in | 19 ++++++++++--------- libiberty/ChangeLog | 4 ++++ libiberty/Makefile.in | 1 + libobjc/ChangeLog | 6 ++++++ libobjc/Makefile.in | 13 +++++++------ libstdc++-v3/ChangeLog | 10 ++++++++++ libstdc++-v3/include/Makefile.am | 30 +++++++++++++++--------------- libstdc++-v3/include/Makefile.in | 30 +++++++++++++++--------------- 9 files changed, 74 insertions(+), 45 deletions(-) diff --git a/libf2c/ChangeLog b/libf2c/ChangeLog index 591586586db..cca5e9c7f7b 100644 --- a/libf2c/ChangeLog +++ b/libf2c/ChangeLog @@ -1,3 +1,9 @@ +2003-01-09 Christian Cornelssen + + * Makefile.in (FLAGS_TO_PASS): Also pass DESTDIR. + (install, uninstall): Prepend $(DESTDIR) to destination + paths in all (un)installation commands. + Wed Dec 18 11:33:35 2002 Jason Merrill * libU77/date_.c (G77_date_y2kbuggy_0): Declare G77_abort_0 noreturn. diff --git a/libf2c/Makefile.in b/libf2c/Makefile.in index 5806a0b9594..0e93ae44e10 100644 --- a/libf2c/Makefile.in +++ b/libf2c/Makefile.in @@ -81,6 +81,7 @@ FLAGS_TO_PASS= \ WARN_CFLAGS='$(WARN_CFLAGS)' \ CFLAGS='$(CFLAGS)' \ CPPFLAGS='$(CPPFLAGS)' \ + DESTDIR='$(DESTDIR)' \ AR='$(AR)' \ RANLIB='$(RANLIB)' \ prefix='$(prefix)' \ @@ -214,21 +215,21 @@ check: cd libU77; $(MAKE) G77DIR=../../../gcc/ check install: all - $(SHELL) $(toplevel_srcdir)/mkinstalldirs $(glibcpp_toolexeclibdir) - $(LIBTOOL) --mode=install $(INSTALL) $(LIBG2C) $(glibcpp_toolexeclibdir) - $(INSTALL_DATA) libfrtbegin.a $(glibcpp_toolexeclibdir) - $(RANLIB) $(glibcpp_toolexeclibdir)/libfrtbegin.a - $(INSTALL_DATA) g2c.h $(libsubdir)/include/g2c.h + $(SHELL) $(toplevel_srcdir)/mkinstalldirs $(DESTDIR)$(glibcpp_toolexeclibdir) + $(LIBTOOL) --mode=install $(INSTALL) $(LIBG2C) $(DESTDIR)$(glibcpp_toolexeclibdir) + $(INSTALL_DATA) libfrtbegin.a $(DESTDIR)$(glibcpp_toolexeclibdir) + $(RANLIB) $(DESTDIR)$(glibcpp_toolexeclibdir)/libfrtbegin.a + $(INSTALL_DATA) g2c.h $(DESTDIR)$(libsubdir)/include/g2c.h $(MULTIDO) $(FLAGS_TO_PASS) multi-do DO="$@" - @-$(LIBTOOL) --mode=finish $(glibcpp_toolexeclibdir) + @-$(LIBTOOL) --mode=finish $(DESTDIR)$(glibcpp_toolexeclibdir) install-strip: $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' install uninstall: - rm -f $(libsubdir)/include/g2c.h - rm -f $(glibcpp_toolexeclibdir)/libfrtbegin.a - $(LIBTOOL) --mode=uninstall rm -f $(glibcpp_toolexeclibdir)$(LIBG2C_BASE).la + rm -f $(DESTDIR)$(libsubdir)/include/g2c.h + rm -f $(DESTDIR)$(glibcpp_toolexeclibdir)/libfrtbegin.a + $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(glibcpp_toolexeclibdir)$(LIBG2C_BASE).la $(MULTIDO) $(FLAGS_TO_PASS) multi-do DO="$@" mostlyclean: diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog index 7280aa03747..8a756b071b8 100644 --- a/libiberty/ChangeLog +++ b/libiberty/ChangeLog @@ -1,3 +1,7 @@ +2003-01-09 Christian Cornelssen + + * Makefile.in (FLAGS_TO_PASS): Also pass DESTDIR. + 2002-12-04 Danny Smith * make-relative-prefix.c (HAVE_HOST_EXECUTABLE_SUFFIX): diff --git a/libiberty/Makefile.in b/libiberty/Makefile.in index cdf14a4311b..9e913ee531d 100644 --- a/libiberty/Makefile.in +++ b/libiberty/Makefile.in @@ -84,6 +84,7 @@ FLAGS_TO_PASS = \ "AR_FLAGS=$(AR_FLAGS)" \ "CC=$(CC)" \ "CFLAGS=$(CFLAGS)" \ + "DESTDIR=$(DESTDIR)" \ "LIBCFLAGS=$(LIBCFLAGS)" \ "EXTRA_OFILES=$(EXTRA_OFILES)" \ "HDEFINES=$(HDEFINES)" \ diff --git a/libobjc/ChangeLog b/libobjc/ChangeLog index 7b8247de658..cddc338d1ea 100644 --- a/libobjc/ChangeLog +++ b/libobjc/ChangeLog @@ -1,3 +1,9 @@ +2003-01-09 Christian Cornelssen + + * Makefile.in (FLAGS_TO_PASS): Also pass DESTDIR. + (install-libs, install-headers): Prepend $(DESTDIR) to + destination paths in all (un)installation commands. + 2002-12-02 Zack Weinberg * thr-objc.c: Include coretypes.h and tm.h. diff --git a/libobjc/Makefile.in b/libobjc/Makefile.in index 4d5c5da8db4..244f1e75a1a 100644 --- a/libobjc/Makefile.in +++ b/libobjc/Makefile.in @@ -118,6 +118,7 @@ FLAGS_TO_PASS = \ "AR_FLAGS=$(AR_FLAGS)" \ "CC=$(CC)" \ "CFLAGS=$(CFLAGS)" \ + "DESTDIR=$(DESTDIR)" \ "LIBCFLAGS=$(LIBCFLAGS)" \ "EXTRA_OFILES=$(EXTRA_OFILES)" \ "HDEFINES=$(HDEFINES)" \ @@ -318,21 +319,21 @@ ${srcdir}/configure: configure.in install: install-libs install-headers install-libs: installdirs - $(SHELL) $(toplevel_srcdir)/mkinstalldirs $(glibcpp_toolexeclibdir) - $(LIBTOOL_INSTALL) $(INSTALL) libobjc.la $(glibcpp_toolexeclibdir); + $(SHELL) $(toplevel_srcdir)/mkinstalldirs $(DESTDIR)$(glibcpp_toolexeclibdir) + $(LIBTOOL_INSTALL) $(INSTALL) libobjc.la $(DESTDIR)$(glibcpp_toolexeclibdir); if [ "$(OBJC_BOEHM_GC)" ]; then \ $(LIBTOOL_INSTALL) $(INSTALL) libobjc_gc.la \ - $(glibcpp_toolexeclibdir);\ + $(DESTDIR)$(glibcpp_toolexeclibdir);\ fi $(MULTIDO) $(FLAGS_TO_PASS) multi-do DO="$@" - @-$(LIBTOOL) --mode=finish $(glibcpp_toolexeclibdir) + @-$(LIBTOOL) --mode=finish $(DESTDIR)$(glibcpp_toolexeclibdir) # Copy Objective C headers to installation include directory. install-headers: - $(SHELL) $(toplevel_srcdir)/mkinstalldirs $(libsubdir)/include/objc + $(SHELL) $(toplevel_srcdir)/mkinstalldirs $(DESTDIR)$(libsubdir)/include/objc for file in $(OBJC_H); do \ realfile=$(srcdir)/objc/$${file}; \ - $(INSTALL_DATA) $${realfile} $(libsubdir)/include/objc; \ + $(INSTALL_DATA) $${realfile} $(DESTDIR)$(libsubdir)/include/objc; \ done check uninstall install-strip dist installcheck installdirs: diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 5236546bbda..5945c93b2f7 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,13 @@ +2003-01-09 Christian Cornelssen + + * include/Makefile.am (install-data-local): Prepend + $(DESTDIR) to destination paths in all (un)installation + commands. Use ${c_base_builddir} and ${std_builddir} + as destination subdirectories to achieve consistency with + preceding mkinstalldirs commands. No effect because both + variables contain "." only. + * include/Makefile.in: Regenerate. + 2003-01-08 Benjamin Kosnik * include/Makefile.am (stamp-*): Add checks for existing stamps. diff --git a/libstdc++-v3/include/Makefile.am b/libstdc++-v3/include/Makefile.am index ae755d21093..dc8da5575c5 100644 --- a/libstdc++-v3/include/Makefile.am +++ b/libstdc++-v3/include/Makefile.am @@ -484,32 +484,32 @@ ${target_builddir}/gthr-default.h: ${toplevel_srcdir}/gcc/${glibcpp_thread_h} \ # the rest are taken from the original source tree. gxx_include_dir = @gxx_include_dir@ install-data-local: - $(mkinstalldirs) ${gxx_include_dir} - $(mkinstalldirs) ${gxx_include_dir}/${bits_builddir} + $(mkinstalldirs) $(DESTDIR)${gxx_include_dir} + $(mkinstalldirs) $(DESTDIR)${gxx_include_dir}/${bits_builddir} for file in ${bits_headers}; do \ - $(INSTALL_DATA) $${file} ${gxx_include_dir}/${bits_builddir}; done - $(mkinstalldirs) ${gxx_include_dir}/${backward_builddir} + $(INSTALL_DATA) $${file} $(DESTDIR)${gxx_include_dir}/${bits_builddir}; done + $(mkinstalldirs) $(DESTDIR)${gxx_include_dir}/${backward_builddir} for file in ${backward_headers}; do \ - $(INSTALL_DATA) $${file} ${gxx_include_dir}/${backward_builddir}; done - $(mkinstalldirs) ${gxx_include_dir}/${ext_builddir} + $(INSTALL_DATA) $${file} $(DESTDIR)${gxx_include_dir}/${backward_builddir}; done + $(mkinstalldirs) $(DESTDIR)${gxx_include_dir}/${ext_builddir} for file in ${ext_headers}; do \ - $(INSTALL_DATA) $${file} ${gxx_include_dir}/${ext_builddir}; done - $(mkinstalldirs) ${gxx_include_dir}/${c_base_builddir} + $(INSTALL_DATA) $${file} $(DESTDIR)${gxx_include_dir}/${ext_builddir}; done + $(mkinstalldirs) $(DESTDIR)${gxx_include_dir}/${c_base_builddir} for file in ${c_base_headers_rename}; do \ - $(INSTALL_DATA) ${c_base_builddir}/$${file} ${gxx_include_dir}; done + $(INSTALL_DATA) ${c_base_builddir}/$${file} $(DESTDIR)${gxx_include_dir}/${c_base_builddir}; done c_base_headers_extra_install='$(c_base_headers_extra)';\ for file in $$c_base_headers_extra_install; do \ - $(INSTALL_DATA) $$file ${gxx_include_dir}/${bits_builddir}; done + $(INSTALL_DATA) $$file $(DESTDIR)${gxx_include_dir}/${bits_builddir}; done c_compatibility_headers_install='$(c_compatibility_headers_extra)';\ for file in $$c_compatibility_headers_install; do \ - $(INSTALL_DATA) $$file ${gxx_include_dir}; done - $(mkinstalldirs) ${gxx_include_dir}/${std_builddir} + $(INSTALL_DATA) $$file $(DESTDIR)${gxx_include_dir}; done + $(mkinstalldirs) $(DESTDIR)${gxx_include_dir}/${std_builddir} for file in ${std_headers_rename}; do \ - $(INSTALL_DATA) ${std_builddir}/$${file} ${gxx_include_dir}; done - $(mkinstalldirs) ${gxx_include_dir}/${target_builddir} + $(INSTALL_DATA) ${std_builddir}/$${file} $(DESTDIR)${gxx_include_dir}/${std_builddir}; done + $(mkinstalldirs) $(DESTDIR)${gxx_include_dir}/${target_builddir} for file in ${target_headers} ${target_headers_extra} \ ${thread_target_headers}; do \ - $(INSTALL_DATA) $${file} ${gxx_include_dir}/${target_builddir}; done + $(INSTALL_DATA) $${file} $(DESTDIR)${gxx_include_dir}/${target_builddir}; done # By adding these files here, automake will remove them for 'make clean' #CLEANFILES = ${allstamps} diff --git a/libstdc++-v3/include/Makefile.in b/libstdc++-v3/include/Makefile.in index eea491efe63..4c0ffddcb3e 100644 --- a/libstdc++-v3/include/Makefile.in +++ b/libstdc++-v3/include/Makefile.in @@ -703,32 +703,32 @@ ${target_builddir}/gthr-default.h: ${toplevel_srcdir}/gcc/${glibcpp_thread_h} \ -e 's,^#include "\(.*\)",#include ,g' \ < ${toplevel_srcdir}/gcc/${glibcpp_thread_h} > $@ install-data-local: - $(mkinstalldirs) ${gxx_include_dir} - $(mkinstalldirs) ${gxx_include_dir}/${bits_builddir} + $(mkinstalldirs) $(DESTDIR)${gxx_include_dir} + $(mkinstalldirs) $(DESTDIR)${gxx_include_dir}/${bits_builddir} for file in ${bits_headers}; do \ - $(INSTALL_DATA) $${file} ${gxx_include_dir}/${bits_builddir}; done - $(mkinstalldirs) ${gxx_include_dir}/${backward_builddir} + $(INSTALL_DATA) $${file} $(DESTDIR)${gxx_include_dir}/${bits_builddir}; done + $(mkinstalldirs) $(DESTDIR)${gxx_include_dir}/${backward_builddir} for file in ${backward_headers}; do \ - $(INSTALL_DATA) $${file} ${gxx_include_dir}/${backward_builddir}; done - $(mkinstalldirs) ${gxx_include_dir}/${ext_builddir} + $(INSTALL_DATA) $${file} $(DESTDIR)${gxx_include_dir}/${backward_builddir}; done + $(mkinstalldirs) $(DESTDIR)${gxx_include_dir}/${ext_builddir} for file in ${ext_headers}; do \ - $(INSTALL_DATA) $${file} ${gxx_include_dir}/${ext_builddir}; done - $(mkinstalldirs) ${gxx_include_dir}/${c_base_builddir} + $(INSTALL_DATA) $${file} $(DESTDIR)${gxx_include_dir}/${ext_builddir}; done + $(mkinstalldirs) $(DESTDIR)${gxx_include_dir}/${c_base_builddir} for file in ${c_base_headers_rename}; do \ - $(INSTALL_DATA) ${c_base_builddir}/$${file} ${gxx_include_dir}; done + $(INSTALL_DATA) ${c_base_builddir}/$${file} $(DESTDIR)${gxx_include_dir}/${c_base_builddir}; done c_base_headers_extra_install='$(c_base_headers_extra)';\ for file in $$c_base_headers_extra_install; do \ - $(INSTALL_DATA) $$file ${gxx_include_dir}/${bits_builddir}; done + $(INSTALL_DATA) $$file $(DESTDIR)${gxx_include_dir}/${bits_builddir}; done c_compatibility_headers_install='$(c_compatibility_headers_extra)';\ for file in $$c_compatibility_headers_install; do \ - $(INSTALL_DATA) $$file ${gxx_include_dir}; done - $(mkinstalldirs) ${gxx_include_dir}/${std_builddir} + $(INSTALL_DATA) $$file $(DESTDIR)${gxx_include_dir}; done + $(mkinstalldirs) $(DESTDIR)${gxx_include_dir}/${std_builddir} for file in ${std_headers_rename}; do \ - $(INSTALL_DATA) ${std_builddir}/$${file} ${gxx_include_dir}; done - $(mkinstalldirs) ${gxx_include_dir}/${target_builddir} + $(INSTALL_DATA) ${std_builddir}/$${file} $(DESTDIR)${gxx_include_dir}/${std_builddir}; done + $(mkinstalldirs) $(DESTDIR)${gxx_include_dir}/${target_builddir} for file in ${target_headers} ${target_headers_extra} \ ${thread_target_headers}; do \ - $(INSTALL_DATA) $${file} ${gxx_include_dir}/${target_builddir}; done + $(INSTALL_DATA) $${file} $(DESTDIR)${gxx_include_dir}/${target_builddir}; done # By adding these files here, automake will remove them for 'make clean' #CLEANFILES = ${allstamps} -- cgit v1.2.1