]> git.ipfire.org Git - thirdparty/gcc.git/commitdiff
projects / thirdparty / gcc.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 8a4c589)
Makefile.in (FLAGS_TO_PASS): Also pass DESTDIR.
authorChristian Cornelssen <ccorn@cs.tu-berlin.de>
Thu, 9 Jan 2003 08:08:30 +0000 (09:08 +0100)
committerAndreas Jaeger <aj@gcc.gnu.org>
Thu, 9 Jan 2003 08:08:30 +0000 (09:08 +0100)
libf2c:
2003-01-09  Christian Cornelssen  <ccorn@cs.tu-berlin.de>

* 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  <ccorn@cs.tu-berlin.de>

* Makefile.in (FLAGS_TO_PASS): Also pass DESTDIR.

libobjc:
2003-01-09  Christian Cornelssen  <ccorn@cs.tu-berlin.de>

* 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  <ccorn@cs.tu-berlin.de>

* 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.

From-SVN: r61082

libf2c/ChangeLog patch | blob | blame | history
libf2c/Makefile.in patch | blob | blame | history
libiberty/ChangeLog patch | blob | blame | history
libiberty/Makefile.in patch | blob | blame | history
libobjc/ChangeLog patch | blob | blame | history
libobjc/Makefile.in patch | blob | blame | history
libstdc++-v3/ChangeLog patch | blob | blame | history
libstdc++-v3/include/Makefile.am patch | blob | blame | history
libstdc++-v3/include/Makefile.in patch | blob | blame | history

diff --git a/libf2c/ChangeLog b/libf2c/ChangeLog
index 591586586dbf309076290d38569410574d973a10..cca5e9c7f7bb30edf7ddcacf22d3b4215fa4b2fc 100644 (file)
--- a/libf2c/ChangeLog
+++ b/libf2c/ChangeLog
@@ -1,3 +1,9 @@
+2003-01-09  Christian Cornelssen  <ccorn@cs.tu-berlin.de>
+
+       * 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  <jason@redhat.com>
 
        * libU77/date_.c (G77_date_y2kbuggy_0): Declare G77_abort_0 noreturn.
diff --git a/libf2c/Makefile.in b/libf2c/Makefile.in
index 5806a0b959495571bc476f1e2dea42ff480cc902..0e93ae44e1035786c2f04f88238ff8dcfcfd6877 100644 (file)
--- 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 7280aa03747f7732781fe580c13cbd276c12feed..8a756b071b81a1b4516e4678330401fef7cb19bf 100644 (file)
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,7 @@
+2003-01-09  Christian Cornelssen  <ccorn@cs.tu-berlin.de>
+
+       * Makefile.in (FLAGS_TO_PASS): Also pass DESTDIR.
+
 2002-12-04  Danny Smith  <dannysmith@users.sourceforge.net>
 
        * make-relative-prefix.c (HAVE_HOST_EXECUTABLE_SUFFIX):
diff --git a/libiberty/Makefile.in b/libiberty/Makefile.in
index cdf14a4311b11589ab2d431f996fe63086a81f82..9e913ee531d8b6b1e5056c9c3ad7afcb44862d23 100644 (file)
--- 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 7b8247de6581e71165031b5fc0f97730b2619d2c..cddc338d1ea6f5c6ef2387192b186628606fa3d0 100644 (file)
--- a/libobjc/ChangeLog
+++ b/libobjc/ChangeLog
@@ -1,3 +1,9 @@
+2003-01-09  Christian Cornelssen  <ccorn@cs.tu-berlin.de>
+
+       * 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  <zack@codesourcery.com>
 
        * thr-objc.c: Include coretypes.h and tm.h.
diff --git a/libobjc/Makefile.in b/libobjc/Makefile.in
index 4d5c5da8db4d584e1f98e40b69db2d96440d0049..244f1e75a1a36a68faab99e5bed13450dda6abe9 100644 (file)
--- 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 5236546bbda51799b7347d9149ecb9095e769f6e..5945c93b2f7efa36f82c9703db622fb7ebf62093 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,13 @@
+2003-01-09  Christian Cornelssen  <ccorn@cs.tu-berlin.de>
+
+       * 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  <bkoz@redhat.com>
 
        * include/Makefile.am (stamp-*): Add checks for existing stamps.
diff --git a/libstdc++-v3/include/Makefile.am b/libstdc++-v3/include/Makefile.am
index ae755d21093e824ed605bf99f9105192ab1cc0bf..dc8da5575c52ae19c9fb63640a7a614bc2a4150c 100644 (file)
--- 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 eea491efe6314775991504f855a4aa32374ccfd1..4c0ffddcb3eb92686492eb0c0424e7df6cb9eaac 100644 (file)
--- 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 <bits/\1>,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} 
Mirror of https://gcc.gnu.org/git/gcc.git