Makefile.am (install-data-local): Use mkinstalldirs.

2002-04-02  Phil Edwards  <pme@gcc.gnu.org>

	* include/Makefile.am (install-data-local):  Use mkinstalldirs.
	* include/Makefile.in:  Regenerate.

From-SVN: r51749

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 34114e77445e30e6ec4e3270648e9db1077e139b..ec8b0afa8baf3b7566124aae6195ef5ba681cc6c 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2002-04-02  Phil Edwards  <pme@gcc.gnu.org>
+
+       * include/Makefile.am (install-data-local):  Use mkinstalldirs.
+       * include/Makefile.in:  Regenerate.
+
 2002-02-20  Release Manager
 
        * GCC 3.0.4 Released.

diff --git a/libstdc++-v3/include/Makefile.am b/libstdc++-v3/include/Makefile.am
index 3b5589f6e5603db90da6ca3f06d46e23cea9a123..45a25c1c29087110d774a4d0f18e272f4edd1f70 100644 (file)
--- a/libstdc++-v3/include/Makefile.am
+++ b/libstdc++-v3/include/Makefile.am
@@ -21,7 +21,7 @@
 ## Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
 ## USA.
 
-## $Id: Makefile.am,v 1.1.6.6 2001/08/29 00:41:56 ljrittle Exp $
+## $Id: Makefile.am,v 1.1.6.7 2002/01/15 23:55:57 ljrittle Exp $
 
 AUTOMAKE_OPTIONS = 1.3 gnits
 MAINT_CHARSET = latin1
@@ -423,25 +423,25 @@ ${thread_builddir}/gthr-default.h:
 gxx_include_dir = @gxx_include_dir@
 
 install-data-local:
-       $(INSTALL) -d ${gxx_include_dir}
-       $(INSTALL) -d ${gxx_include_dir}/${bits_builddir}
+       $(mkinstalldirs) ${gxx_include_dir}
+       $(mkinstalldirs) ${gxx_include_dir}/${bits_builddir}
        for file in ${bits_headers}; do \
          $(INSTALL_DATA) $${file} ${gxx_include_dir}/${bits_builddir}; done
-       $(INSTALL) -d ${gxx_include_dir}/${backward_builddir}
+       $(mkinstalldirs) ${gxx_include_dir}/${backward_builddir}
        for file in ${backward_headers}; do \
          $(INSTALL_DATA) $${file} ${gxx_include_dir}/${backward_builddir}; done
-       $(INSTALL) -d ${gxx_include_dir}/${ext_builddir}
+       $(mkinstalldirs) ${gxx_include_dir}/${ext_builddir}
        for file in ${ext_headers}; do \
          $(INSTALL_DATA) $${file} ${gxx_include_dir}/${ext_builddir}; done
-       $(INSTALL) -d ${gxx_include_dir}/${c_base_builddir}
+       $(mkinstalldirs) ${gxx_include_dir}/${c_base_builddir}
        for file in ${c_base_headers}; do \
          $(INSTALL_DATA) $${file} ${gxx_include_dir}/${c_base_builddir}; done
-       $(INSTALL) -d ${gxx_include_dir}/${std_builddir}
+       $(mkinstalldirs) ${gxx_include_dir}/${std_builddir}
        for file in ${std_headers}; do \
          $(INSTALL_DATA) $${file} ${gxx_include_dir}/${std_builddir}; done
-       $(INSTALL) -d ${gxx_include_dir}/${target_builddir}
+       $(mkinstalldirs) ${gxx_include_dir}/${target_builddir}
        for file in ${target_headers} ${extra_target_headers}; do \
          $(INSTALL_DATA) $${file} ${gxx_include_dir}/${target_builddir}; done
-       $(INSTALL) -d ${gxx_include_dir}/${thread_builddir}
+       $(mkinstalldirs) ${gxx_include_dir}/${thread_builddir}
        for file in ${thread_headers}; do \
          $(INSTALL_DATA) $${file} ${gxx_include_dir}/${thread_builddir}; done

diff --git a/libstdc++-v3/include/Makefile.in b/libstdc++-v3/include/Makefile.in
index dba4895c985420370793af6e26e63822d819f293..3e9c12a0ab7ae0db07273ddc7e13ddf8b738466d 100644 (file)
--- a/libstdc++-v3/include/Makefile.in
+++ b/libstdc++-v3/include/Makefile.in
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
+# Makefile.in generated automatically by automake 1.4 from Makefile.am
 
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -368,7 +368,11 @@ target_headers = \
        ${glibcpp_srcdir}/@ATOMICITY_INC_SRCDIR@/atomicity.h \
        ${glibcpp_srcdir}/@LIMITS_INC_SRCDIR@/limits.h
 
-extra_target_headers =         ${target_builddir}/basic_file_model.h   ${target_builddir}/c++config.h  ${target_builddir}/c++io.h      ${target_builddir}/c++locale.h
+extra_target_headers = \
+       ${target_builddir}/basic_file_model.h \
+       ${target_builddir}/c++config.h \
+       ${target_builddir}/c++io.h \
+       ${target_builddir}/c++locale.h
 
 
 thread_builddir = ./${target_alias}/bits
@@ -402,14 +406,14 @@ DIST_COMMON =  Makefile.am Makefile.in
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
-TAR = tar
+TAR = gtar
 GZIP_ENV = --best
 all: all-redirect
 .SUFFIXES:
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-       cd $(top_srcdir) && $(AUTOMAKE) --cygnus include/Makefile
+       cd $(top_srcdir) && $(AUTOMAKE) --gnits include/Makefile
 
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
        cd $(top_builddir) \
          && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
@@ -422,8 +426,13 @@ distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
 subdir = include
 
 distdir: $(DISTFILES)
+       here=`cd $(top_builddir) && pwd`; \
+       top_distdir=`cd $(top_distdir) && pwd`; \
+       distdir=`cd $(distdir) && pwd`; \
+       cd $(top_srcdir) \
+         && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnits include/Makefile
        @for file in $(DISTFILES); do \
-         if test -f $$file; then d=.; else d=$(srcdir); fi; \
+         d=$(srcdir); \
          if test -d $$d/$$file; then \
            cp -pr $$d/$$file $(distdir)/$$file; \
          else \
@@ -436,12 +445,10 @@ info-am:
 info: info-am
 dvi-am:
 dvi: dvi-am
-check-am:
+check-am: all-am
 check: check-am
 installcheck-am:
 installcheck: installcheck-am
-install-info-am: 
-install-info: install-info-am
 install-exec-am:
 install-exec: install-exec-am
 
@@ -490,12 +497,11 @@ maintainer-clean-am:  maintainer-clean-generic distclean-am
 maintainer-clean: maintainer-clean-am
 
 .PHONY: tags distdir info-am info dvi-am dvi check check-am \
-installcheck-am installcheck install-info-am install-info \
-install-exec-am install-exec install-data-local install-data-am \
-install-data install-am install uninstall-am uninstall all-local \
-all-redirect all-am all installdirs mostlyclean-generic \
-distclean-generic clean-generic maintainer-clean-generic clean \
-mostlyclean distclean maintainer-clean
+installcheck-am installcheck install-exec-am install-exec \
+install-data-local install-data-am install-data install-am install \
+uninstall-am uninstall all-local all-redirect all-am all installdirs \
+mostlyclean-generic distclean-generic clean-generic \
+maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 
 
 # Here are the rules for building the headers
@@ -606,26 +612,26 @@ ${thread_builddir}/gthr-default.h:
            < ${toplevel_srcdir}/gcc/${glibcpp_thread_h} > $@
 
 install-data-local:
-       $(INSTALL) -d ${gxx_include_dir}
-       $(INSTALL) -d ${gxx_include_dir}/${bits_builddir}
+       $(mkinstalldirs) ${gxx_include_dir}
+       $(mkinstalldirs) ${gxx_include_dir}/${bits_builddir}
        for file in ${bits_headers}; do \
          $(INSTALL_DATA) $${file} ${gxx_include_dir}/${bits_builddir}; done
-       $(INSTALL) -d ${gxx_include_dir}/${backward_builddir}
+       $(mkinstalldirs) ${gxx_include_dir}/${backward_builddir}
        for file in ${backward_headers}; do \
          $(INSTALL_DATA) $${file} ${gxx_include_dir}/${backward_builddir}; done
-       $(INSTALL) -d ${gxx_include_dir}/${ext_builddir}
+       $(mkinstalldirs) ${gxx_include_dir}/${ext_builddir}
        for file in ${ext_headers}; do \
          $(INSTALL_DATA) $${file} ${gxx_include_dir}/${ext_builddir}; done
-       $(INSTALL) -d ${gxx_include_dir}/${c_base_builddir}
+       $(mkinstalldirs) ${gxx_include_dir}/${c_base_builddir}
        for file in ${c_base_headers}; do \
          $(INSTALL_DATA) $${file} ${gxx_include_dir}/${c_base_builddir}; done
-       $(INSTALL) -d ${gxx_include_dir}/${std_builddir}
+       $(mkinstalldirs) ${gxx_include_dir}/${std_builddir}
        for file in ${std_headers}; do \
          $(INSTALL_DATA) $${file} ${gxx_include_dir}/${std_builddir}; done
-       $(INSTALL) -d ${gxx_include_dir}/${target_builddir}
+       $(mkinstalldirs) ${gxx_include_dir}/${target_builddir}
        for file in ${target_headers} ${extra_target_headers}; do \
          $(INSTALL_DATA) $${file} ${gxx_include_dir}/${target_builddir}; done
-       $(INSTALL) -d ${gxx_include_dir}/${thread_builddir}
+       $(mkinstalldirs) ${gxx_include_dir}/${thread_builddir}
        for file in ${thread_headers}; do \
          $(INSTALL_DATA) $${file} ${gxx_include_dir}/${thread_builddir}; done